aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2020-05-12 11:01:46 +0200
committerTibor Frank <tifrank@cisco.com>2020-05-12 09:05:02 +0000
commit060bc07f13e08a843457d219566ec96f74504f4e (patch)
tree648574d949d903a939eaf02ad66f6bf8cca9808a /resources
parente6b611c0624f1bf4e3e54b1f920397f761e61de5 (diff)
Report: Fix header of comp tables, add data
Change-Id: I6d8727a08dce888bfbc620ebe34b6bd35bac488b Signed-off-by: Tibor Frank <tifrank@cisco.com> (cherry picked from commit a487639f5c0405ba8afadc1887d14f3cb7960e89)
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/generator_tables.py7
-rw-r--r--resources/tools/presentation/specification.yaml18
2 files changed, 13 insertions, 12 deletions
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 42393fd138..eeffc27dd7 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -611,6 +611,8 @@ def _tpc_generate_html_table(header, data, out_file_name, legend=u"",
f'src="../..{out_file_name.replace(u"_build", u"")}_in.html">'
f'</iframe>\n\n'
)
+
+ # TODO: Use html (rst) list for legend and footnote
if legend:
rst_file.write(legend[1:].replace(u"\n", u" |br| "))
if footnote:
@@ -667,8 +669,7 @@ def table_soak_vs_ndr(table, input_data):
f"Percentage change calculated for mean values.\n"
u"Stdev(Diff): "
u"Standard deviation of percentage change calculated for mean "
- u"values.\n"
- u":END"
+ u"values."
)
except (AttributeError, KeyError) as err:
logging.error(f"The model is invalid, missing parameter: {repr(err)}")
@@ -1748,8 +1749,6 @@ def table_comparison(table, input_data):
with open(txt_file_name, u'a', encoding='utf-8') as txt_file:
txt_file.write(legend)
txt_file.write(footnote)
- if legend or footnote:
- txt_file.write(u"\n:END")
# Generate html table:
_tpc_generate_html_table(
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index b07d513f1f..1c4614047a 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -670,6 +670,7 @@
- 87 # NDRPDR full - ip6-1
- 88 # NDRPDR full - ip6-2
- 90 # NDRPDR full - memif
+ - 95 # NDRPDR full - l2-1
vpp-perf-results-2n-skx:
csit-vpp-perf-verify-2001-2n-skx:
@@ -2472,6 +2473,7 @@
- 87 # NDRPDR full - ip6-1
- 88 # NDRPDR full - ip6-2
- 90 # NDRPDR full - memif
+ - 95 # NDRPDR full - l2-1
- 50 # MRR sel
- 53 # MRR sel addition
@@ -3544,7 +3546,7 @@
data-set: "vpp-perf-changes-3n-skx-old1908_1"
- title: "1908.1-2"
data-set: "vpp-perf-changes-3n-skx-new1908_1"
- - title: "2001.0-1"
+ - title: "2001.0-2"
data-set: "vpp-perf-changes-3n-skx-new2001_0"
comparisons:
- title: "Diff1"
@@ -3558,7 +3560,7 @@
- "Legend to Table"
- "YYMM.MV-EV - tested VPP version (YY year, MM month, MV minor version) and CSIT test environment version (EV environment version), covered versions are 1908.0-1, 1908.1-1, 1908.1-2, 2001.0-2."
- "Diff1 - difference between the previous and the current environment for the same VPP version, 1908.1-2 vs. 1908.1-1 (if latter results not available, 1908.0-1 is used)."
- - "Diff2 - difference between the previous and the current VPP version in the current environment, 2001.0-1 vs. 1908.1-2."
+ - "Diff2 - difference between the previous and the current VPP version in the current environment, 2001.0-2 vs. 1908.1-2."
- "RCA1 - root cause analysis reference for Diff1."
- "RCA2 - root cause analysis reference for Diff2."
@@ -3582,7 +3584,7 @@
data-set: "vpp-perf-changes-3n-skx-old1908_1"
- title: "1908.1-2"
data-set: "vpp-perf-changes-3n-skx-new1908_1"
- - title: "2001.0-1"
+ - title: "2001.0-2"
data-set: "vpp-perf-changes-3n-skx-new2001_0"
comparisons:
- title: "Diff1"
@@ -3596,7 +3598,7 @@
- "Legend to Table"
- "YYMM.MV-EV - tested VPP version (YY year, MM month, MV minor version) and CSIT test environment version (EV environment version), covered versions are 1908.0-1, 1908.1-1, 1908.1-2, 2001.0-2."
- "Diff1 - difference between the previous and the current environment for the same VPP version, 1908.1-2 vs. 1908.1-1 (if latter results not available, 1908.0-1 is used)."
- - "Diff2 - difference between the previous and the current VPP version in the current environment, 2001.0-1 vs. 1908.1-2."
+ - "Diff2 - difference between the previous and the current VPP version in the current environment, 2001.0-2 vs. 1908.1-2."
- "RCA1 - root cause analysis reference for Diff1."
- "RCA2 - root cause analysis reference for Diff2."
@@ -3728,7 +3730,7 @@
data-set: "vpp-perf-changes-2n-skx-old1908_1"
- title: "1908.1-2"
data-set: "vpp-perf-changes-2n-skx-new1908_1"
- - title: "2001.0-1"
+ - title: "2001.0-2"
data-set: "vpp-perf-changes-2n-skx-new2001_0"
comparisons:
- title: "Diff1"
@@ -3742,7 +3744,7 @@
- "Legend to Table"
- "YYMM.MV-EV - tested VPP version (YY year, MM month, MV minor version) and CSIT test environment version (EV environment version), covered versions are 1908.0-1, 1908.1-1, 1908.1-2, 2001.0-2."
- "Diff1 - difference between the previous and the current environment for the same VPP version, 1908.1-2 vs. 1908.1-1 (if latter results not available, 1908.0-1 is used)."
- - "Diff2 - difference between the previous and the current VPP version in the current environment, 2001.0-1 vs. 1908.1-2."
+ - "Diff2 - difference between the previous and the current VPP version in the current environment, 2001.0-2 vs. 1908.1-2."
- "RCA1 - root cause analysis reference for Diff1."
- "RCA2 - root cause analysis reference for Diff2."
@@ -3766,7 +3768,7 @@
data-set: "vpp-perf-changes-2n-skx-old1908_1"
- title: "1908.1-2"
data-set: "vpp-perf-changes-2n-skx-new1908_1"
- - title: "2001.0-1"
+ - title: "2001.0-2"
data-set: "vpp-perf-changes-2n-skx-new2001_0"
comparisons:
- title: "Diff1"
@@ -3780,7 +3782,7 @@
- "Legend to Table"
- "YYMM.MV-EV - tested VPP version (YY year, MM month, MV minor version) and CSIT test environment version (EV environment version), covered versions are 1908.0-1, 1908.1-1, 1908.1-2, 2001.0-2."
- "Diff1 - difference between the previous and the current environment for the same VPP version, 1908.1-2 vs. 1908.1-1 (if latter results not available, 1908.0-1 is used)."
- - "Diff2 - difference between the previous and the current VPP version in the current environment, 2001.0-1 vs. 1908.1-2."
+ - "Diff2 - difference between the previous and the current VPP version in the current environment, 2001.0-2 vs. 1908.1-2."
- "RCA1 - root cause analysis reference for Diff1."
- "RCA2 - root cause analysis reference for Diff2."