aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2019-12-09 13:10:07 +0100
committerTibor Frank <tifrank@cisco.com>2019-12-09 14:36:46 +0100
commit190462e1f242b59d927eff3e63826fe6343eadbc (patch)
tree76b9ff9aeb62a18e72ce8731680dd74b74c774ed
parent762c67cae040358876e470822ad50a77d4f03c12 (diff)
Trending: Use Mpps
Change-Id: I63efaa244aa4931a8ab474bc64520e1f501ad57a Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--resources/tools/presentation/generator_cpta.py2
-rw-r--r--resources/tools/presentation/generator_tables.py2
-rw-r--r--resources/tools/presentation/input_data_parser.py3
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml9
4 files changed, 7 insertions, 9 deletions
diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index f63caa40af..c9bc44c460 100644
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -169,7 +169,7 @@ def _generate_trending_traces(in_data, job_name, build_info,
"""
data_x = list(in_data.keys())
- data_y = list(in_data.values())
+ data_y = [float(item) / 1e6 for item in in_data.values()]
hover_text = list()
xaxis = list()
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 71651969e1..7c99ab5d72 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -124,7 +124,7 @@ def table_details(table, input_data):
u"data"].split(" ")[1]]).replace(u'"', u'""')
if column[u"data"].split(u" ")[1] in \
(u"conf-history", u"show-run"):
- col_data = col_data.replace(u" |br| ", u"", )
+ col_data = col_data.replace(u" |br| ", u"", 1)
col_data = f" |prein| {col_data[:-5]} |preout| "
row_lst.append(f'"{col_data}"')
except KeyError:
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index d23fa8454d..2f126f4c8b 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -429,7 +429,6 @@ class ExecutionChecker(ResultVisitor):
r"PAPI command history:", u"",
msg.message, count=1).replace(u'\n', u' |br| ').\
replace(u'"', u"'")
-
self._data[u"tests"][self._test_id][u"conf-history"] += (
f" |br| **DUT{str(self._conf_history_lookup_nr)}:** {text}"
)
@@ -528,7 +527,7 @@ class ExecutionChecker(ResultVisitor):
txt_table.align[u"Vectors/Calls"] = u"r"
text += txt_table.get_string(sortby=u"Name") + u'\n'
- text = f" \n**DUT: {host}{socket}**\n{text}".\
+ text = f"\n**DUT: {host}{socket}**\n{text}".\
replace(u'\n', u' |br| ').\
replace(u'\r', u'').\
replace(u'"', u"'")
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index ac7fb5d402..cb2e6997a4 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -559,9 +559,9 @@
height: 800
yaxis:
showticklabels: True
- tickformat: ".4s"
- title: "Throughput [pps]"
- hoverformat: ".4s"
+ tickformat: ".5s"
+ title: "Throughput [Mpps]"
+ hoverformat: ".5s"
gridcolor: "rgb(238, 238, 238)"
linecolor: "rgb(238, 238, 238)"
showline: True
@@ -610,9 +610,8 @@
l: 70
legend:
orientation: "h"
- xanchor: "center"
+ xanchor: "auto"
traceorder: "normal" # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
- tracegroupgap: 20
bordercolor: "rgb(238, 238, 238)"
paper_bgcolor: "#fff"
plot_bgcolor: "#fff"