aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/presentation
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-04-12 15:40:07 +0200
committerTibor Frank <tifrank@cisco.com>2018-04-12 13:40:59 +0000
commit295a68551716af397597bc721d6a3115572009f9 (patch)
treef945fac778c39d46b1a9f8c5cd5a8e36452314cc /resources/tools/presentation
parentd3c64b0e39300b688f9339434436c6ecbcaee455 (diff)
CSIT-1041: Trending dashboard
Change-Id: Iac6d4e5bd8b1e10d3ae3206a8361c434fb4b49ea Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources/tools/presentation')
-rw-r--r--resources/tools/presentation/generator_tables.py25
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml2
2 files changed, 13 insertions, 14 deletions
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 6c301878ce..9f0096557e 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -18,7 +18,6 @@
import logging
import csv
import prettytable
-import numpy as np
import pandas as pd
from string import replace
@@ -441,7 +440,7 @@ def table_performance_comparison(table, input_data):
table["output-file-ext"])
]
for file_name in tbl_names:
- logging.info(" Writing file: '{}'".format(file_name))
+ logging.info(" Writing file: '{0}'".format(file_name))
with open(file_name, "w") as file_handler:
file_handler.write(header_str)
for test in tbl_lst:
@@ -462,7 +461,7 @@ def table_performance_comparison(table, input_data):
for i, txt_name in enumerate(tbl_names_txt):
txt_table = None
- logging.info(" Writing file: '{}'".format(txt_name))
+ logging.info(" Writing file: '{0}'".format(txt_name))
with open(tbl_names[i], 'rb') as csv_file:
csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
for row in csv_content:
@@ -484,7 +483,7 @@ def table_performance_comparison(table, input_data):
output_file = "{0}-ndr-1t1c-top{1}".format(table["output-file"],
table["output-file-ext"])
- logging.info(" Writing file: '{}'".format(output_file))
+ logging.info(" Writing file: '{0}'".format(output_file))
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[1:]):
@@ -494,7 +493,7 @@ def table_performance_comparison(table, input_data):
output_file = "{0}-ndr-1t1c-bottom{1}".format(table["output-file"],
table["output-file-ext"])
- logging.info(" Writing file: '{}'".format(output_file))
+ logging.info(" Writing file: '{0}'".format(output_file))
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[-1:0:-1]):
@@ -511,7 +510,7 @@ def table_performance_comparison(table, input_data):
output_file = "{0}-pdr-1t1c-top{1}".format(table["output-file"],
table["output-file-ext"])
- logging.info(" Writing file: '{}'".format(output_file))
+ logging.info(" Writing file: '{0}'".format(output_file))
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[1:]):
@@ -521,7 +520,7 @@ def table_performance_comparison(table, input_data):
output_file = "{0}-pdr-1t1c-bottom{1}".format(table["output-file"],
table["output-file-ext"])
- logging.info(" Writing file: '{}'".format(output_file))
+ logging.info(" Writing file: '{0}'".format(output_file))
with open(output_file, "w") as out_file:
out_file.write(header_str)
for i, line in enumerate(lines[-1:0:-1]):
@@ -567,7 +566,7 @@ def table_performance_trending_dashboard(table, input_data):
"data": list()}
try:
tbl_dict[tst_name]["data"]. \
- append(tst_data["throughput"]["value"])
+ append(tst_data["result"]["throughput"])
except TypeError:
pass # No data in output.xml for this test
@@ -606,19 +605,19 @@ def table_performance_trending_dashboard(table, input_data):
anomaly])
# Sort the table according to the relative change
- tbl_lst.sort(key=lambda rel: rel[-1], reverse=True)
+ tbl_lst.sort(key=lambda rel: rel[-2], reverse=True)
- file_name = "{}.{}".format(table["output-file"], table["output-file-ext"])
+ file_name = "{0}.{1}".format(table["output-file"], table["output-file-ext"])
- logging.info(" Writing file: '{}'".format(file_name))
+ logging.info(" Writing file: '{0}'".format(file_name))
with open(file_name, "w") as file_handler:
file_handler.write(header_str)
for test in tbl_lst:
file_handler.write(",".join([str(item) for item in test]) + '\n')
- txt_file_name = "{}.txt".format(table["output-file"])
+ txt_file_name = "{0}.txt".format(table["output-file"])
txt_table = None
- logging.info(" Writing file: '{}'".format(txt_file_name))
+ logging.info(" Writing file: '{0}'".format(txt_file_name))
with open(file_name, 'rb') as csv_file:
csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
for row in csv_content:
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index aa29cec15b..cbd2391ca9 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -255,7 +255,7 @@
parameters:
- "name"
- "parent"
- - "throughput"
+ - "result"
# Number of the best and the worst tests presented in the table. Use 0 (zero)
# to present all tests.
nr-of-tests-shown: 20