summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Beierl <mark.beierl@dell.com>2017-09-11 15:23:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-11 15:23:20 +0000
commit6ccd0b7fc70157707884f44d9657e8eba8145ea4 (patch)
treecfe053e35a41ea6e1055e8a0876ddb905fd5b88f
parentb8f6ce5a13fb9ae4c1da3fb22f2c404ad9118a0f (diff)
parent839c7bfe8fcf9f0bf78916cbcfa47d94b1b6ed2c (diff)
Merge "Creating intermediate page for the single-data-json files JIRA: STORPERF-163"
-rw-r--r--docker/storperf-reporting/src/app.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/storperf-reporting/src/app.py b/docker/storperf-reporting/src/app.py
index e2d889d..46318ca 100644
--- a/docker/storperf-reporting/src/app.py
+++ b/docker/storperf-reporting/src/app.py
@@ -30,13 +30,13 @@ def get_data(data):
details = temp[0].get('details')
metrics = details.get('metrics')
report_data = details.get('report_data')
- return "single", metrics, report_data
+ return "single", metrics, report_data, temp
else:
return "multi", temp
else:
metrics = temp.get('metrics')
report_data = temp.get('report_data')
- return "single", metrics, report_data
+ return "single", metrics, report_data, temp
@app.route('/reporting/success/')
@@ -65,8 +65,10 @@ def success():
response = get_data(data)
if response[0] == "single":
metrics, report_data = response[1], response[2]
- return render_template('plot_tables.html',
- metrics=metrics, report_data=report_data)
+ results = response[3]
+ return render_template('plot_multi_data.html',
+ metrics=metrics, report_data=report_data,
+ results=results)
else:
return render_template('plot_multi_data.html',
results=response[1])