aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2020-03-06 12:59:01 +0100
committerTibor Frank <tifrank@cisco.com>2020-03-09 16:57:55 +0100
commit6420897309b9e677f9352e5bfee007b3421eb2c5 (patch)
treea70262d0dd272ba813234d5c370d3d2e5fa2f359 /resources
parentef178b5309a19e3438a8aea2d3e23810099f5d77 (diff)
Report: Detailed test results
- 3rd level Change-Id: Iae8141ff64ae61711ae8e69b67a92cfcb0f3f937 Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/generator_files.py171
-rw-r--r--resources/tools/presentation/generator_tables.py3
-rw-r--r--resources/tools/presentation/specification.yaml328
3 files changed, 292 insertions, 210 deletions
diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py
index 33c389ece5..025fc18150 100644
--- a/resources/tools/presentation/generator_files.py
+++ b/resources/tools/presentation/generator_files.py
@@ -14,7 +14,9 @@
"""Algorithms to generate files.
"""
-from os.path import isfile
+import re
+
+from os.path import join
from collections import OrderedDict
import logging
@@ -32,6 +34,8 @@ RST_INCLUDE_TABLE = (u"\n.. only:: html\n\n"
u"\n .. raw:: latex\n\n"
u" \\csvautolongtable{{{file_latex}}}\n\n")
+REGEX_NIC_SHORT = re.compile(r'(\d*ge\dp\d)(\D*\d*[a-z]*)-')
+
def generate_files(spec, data):
"""Generate all files specified in the specification file.
@@ -151,6 +155,7 @@ def file_details_split(file_spec, input_data, frmt=u"rst"):
if tests.empty:
return
tests = input_data.merge_data(tests)
+ tests.sort_index(inplace=True)
logging.info(u" Creating the suite data set...")
suites = input_data.filter_data(
@@ -166,8 +171,8 @@ def file_details_split(file_spec, input_data, frmt=u"rst"):
logging.info(u" Generating files...")
- file_name = u""
- sub_chapter = u"-".join(table_set.split(u"_")[-2:])
+ chapter_l1 = u""
+ chapter_l2 = u"-".join(table_set.split(u"_")[-2:])
for suite_longname, suite in suites.items():
suite_lvl = len(suite_longname.split(u"."))
@@ -177,48 +182,36 @@ def file_details_split(file_spec, input_data, frmt=u"rst"):
if suite_lvl == start_lvl:
# Our top-level suite
- chapter = suite_longname.split(u'.')[-1]
- file_name = f"{table_set}/{chapter}.rst"
- logging.info(f" Writing file {file_name}")
- with open(file_name, u"a") as file_handler:
- file_handler.write(rst_header)
- if chapters.get(chapter, None) is None:
- chapters[chapter] = OrderedDict()
- chapters[chapter][sub_chapter] = file_name
-
- title_line = get_rst_title_char(suite[u"level"] - start_lvl + 2) * \
- len(sub_chapter)
- with open(file_name, u"a") as file_handler:
- if not (u"-ndrpdr" in suite[u"name"] or
- u"-mrr" in suite[u"name"] or
- u"-dev" in suite[u"name"]):
- file_handler.write(f"\n{sub_chapter}\n{title_line}\n")
-
- if _tests_in_suite(suite[u"name"], tests):
- for tbl_file in table_lst:
- if suite[u"name"] in tbl_file:
- title_line = get_rst_title_char(
- suite[u"level"] - start_lvl + 2) * \
- len(suite[u"name"])
- file_handler.write(
- f"\n{suite[u'name']}\n{title_line}\n"
- )
- file_handler.write(
- f"\n{suite[u'doc']}\n".
- replace(u'|br|', u'\n\n -')
+ chapter_l1 = suite_longname.split(u'.')[-1]
+ if chapters.get(chapter_l1, None) is None:
+ chapters[chapter_l1] = OrderedDict()
+ if chapters[chapter_l1].get(chapter_l2, None) is None:
+ chapters[chapter_l1][chapter_l2] = OrderedDict()
+ continue
+
+ if _tests_in_suite(suite[u"name"], tests):
+ groups = re.search(REGEX_NIC_SHORT, suite[u"name"])
+ nic = groups.group(2) if groups else None
+ if nic is None:
+ continue
+ if chapters[chapter_l1][chapter_l2].get(nic, None) is None:
+ chapters[chapter_l1][chapter_l2][nic] = dict(
+ rst_file=f"{join(table_set, chapter_l1)}_{nic}.rst".
+ replace(u"2n1l-", u""),
+ tables=list()
+ )
+ for idx, tbl_file in enumerate(table_lst):
+ if suite[u"name"] in tbl_file:
+ chapters[chapter_l1][chapter_l2][nic][u"tables"].append(
+ (
+ table_lst.pop(idx),
+ suite[u"doc"].replace(u'|br|', u'\n\n -')
)
- if frmt == u"html":
- file_handler.write(
- f"\n.. include:: {tbl_file.split(u'/')[-1]}"
- f"\n"
- )
- elif frmt == u"rst":
- file_handler.write(
- RST_INCLUDE_TABLE.format(
- file_latex=tbl_file,
- file_html=tbl_file.split(u"/")[-1])
- )
- break
+ )
+ break
+
+ print(chapters)
+
titles = {
# VPP Perf, MRR
u"container_memif": u"LXC/DRC Container Memif",
@@ -242,37 +235,75 @@ def file_details_split(file_spec, input_data, frmt=u"rst"):
}
order_chapters = file_spec.get(u"order-chapters", None)
- if not order_chapters:
- order_chapters = chapters.keys()
- order_sub_chapters = file_spec.get(u"order-sub-chapters", None)
+ if order_chapters:
+ order_1 = order_chapters.get(u"level-1", None)
+ order_2 = order_chapters.get(u"level-2", None)
+ order_3 = order_chapters.get(u"level-3", None)
+ if not order_1:
+ order_1 = chapters.keys()
+ else:
+ order_1 = None
+ order_2 = None
+ order_3 = None
- for chapter in order_chapters:
- sub_chapters = chapters.get(chapter, None)
- if not sub_chapters:
+ for chapter_l1 in order_1:
+ content_l1 = chapters.get(chapter_l1, None)
+ if not content_l1:
continue
with open(f"{fileset_file_name}/index.rst", u"a") as file_handler:
- file_handler.write(f" {chapter}\n")
- chapter_file_name = f"{fileset_file_name}/{chapter}.rst"
- if not isfile(chapter_file_name):
- with open(chapter_file_name, u"a") as file_handler:
- title = titles.get(chapter, chapter)
- file_handler.write(
- f"{title}\n"
- f"{get_rst_title_char(1) * len(title)}\n\n"
- f".. toctree::\n\n"
- )
-
- if not order_sub_chapters:
- order_sub_chapters = sub_chapters.keys()
- for sub_chapter in order_sub_chapters:
- testbed = sub_chapters.get(sub_chapter, None)
- if not testbed:
+ file_handler.write(f" {chapter_l1}\n")
+ l1_file_name = f"{join(fileset_file_name, chapter_l1)}.rst"
+ title = titles.get(chapter_l1, chapter_l1)
+ logging.info(f" Generating {title} ...")
+ with open(l1_file_name, u"w") as file_handler:
+ file_handler.write(
+ f"{title}\n"
+ f"{get_rst_title_char(1) * len(title)}\n\n"
+ f".. toctree::\n\n"
+ )
+
+ if not order_2:
+ order_2 = chapters[chapter_l1].keys()
+ for chapter_l2 in order_2:
+ content_l2 = content_l1.get(chapter_l2, None)
+ if not content_l2:
continue
- with open(chapter_file_name, u"a") as file_handler:
- file_handler.write(
- f" ../{u'/'.join(testbed.split(u'/')[-2:])}\n"
- )
+ if not order_3:
+ order_3 = chapters[chapter_l1][chapter_l2].keys()
+ for chapter_l3 in order_3:
+ content_l3 = content_l2.get(chapter_l3, None)
+ if not content_l3:
+ continue
+ with open(l1_file_name, u"a") as file_handler:
+ item = u"/".join(content_l3[u'rst_file'].split(u'/')[-2:])
+ file_handler.write(f" ../{item}\n")
+ logging.info(f" Writing the file {content_l3[u'rst_file']}")
+ with open(content_l3[u'rst_file'], u"w+") as file_handler:
+ title = f"{chapter_l2}-{chapter_l3}"
+ file_handler.write(
+ f"{rst_header}\n"
+ f"{title}\n"
+ f"{get_rst_title_char(2) * len(title)}\n"
+ )
+ for table in content_l3[u'tables']:
+ title = table[0].split(u"/")[-1].split(u".")[0]
+ file_handler.write(
+ f"\n{title}\n"
+ f"{get_rst_title_char(3) * len(title)}\n"
+ )
+ file_handler.write(f"\n{table[1]}\n")
+ if frmt == u"html":
+ file_handler.write(
+ f"\n.. include:: {table[0].split(u'/')[-1]}"
+ f"\n"
+ )
+ elif frmt == u"rst":
+ file_handler.write(
+ RST_INCLUDE_TABLE.format(
+ file_latex=table[0],
+ file_html=table[0].split(u"/")[-1])
+ )
def file_details_split_html(file_spec, input_data):
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 6f075d1f9f..835e6cf012 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -354,7 +354,8 @@ def table_merged_details(table, input_data):
# Write the data to file
if table_lst:
- file_name = f"{table[u'output-file']}_{suite_name}.csv"
+ separator = u"" if table[u'output-file'].endswith(u"/") else u"_"
+ file_name = f"{table[u'output-file']}{separator}{suite_name}.csv"
logging.info(f" Writing file: {file_name}")
with open(file_name, u"wt") as file_handler:
file_handler.write(u",".join(header) + u"\n")
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 508514db2c..712c28b409 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -4674,7 +4674,7 @@
- type: "table"
title: "Detailed Test Results - VPP Performance Results 3n-hsw"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
+ output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4691,7 +4691,7 @@
#- type: "table"
# title: "Detailed Test Results - VPP Performance Results 3n-skx"
# algorithm: "table_merged_details"
-# output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
+# output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/"
# columns:
# - title: " |prein| Test Name |preout| "
# data: "data name"
@@ -4708,7 +4708,7 @@
#- type: "table"
# title: "Detailed Test Results - VPP Performance Results 2n-skx"
# algorithm: "table_merged_details"
-# output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
+# output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/"
# columns:
# - title: " |prein| Test Name |preout| "
# data: "data name"
@@ -4725,7 +4725,7 @@
- type: "table"
title: "Detailed Test Results - VPP Performance Results 2n-clx"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}/vpp_performance_results_2n_clx"
+ output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4742,7 +4742,7 @@
- type: "table"
title: "Detailed Test Results - VPP Performance Results 3n-tsh"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}/vpp_performance_results_3n_tsh"
+ output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4759,7 +4759,7 @@
- type: "table"
title: "Detailed Test Results - VPP Performance Results 3n-dnv"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/vpp_performance_results_3n_dnv"
+ output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4793,7 +4793,7 @@
- type: "table"
title: "Test configuration - VPP Performance Test Configs 3n-hsw"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
+ output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4810,7 +4810,7 @@
#- type: "table"
# title: "Test configuration - VPP Performance Test Configs 3n-skx"
# algorithm: "table_merged_details"
-# output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
+# output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/"
# columns:
# - title: " |prein| Test Name |preout| "
# data: "data name"
@@ -4827,7 +4827,7 @@
#- type: "table"
# title: "Test configuration - VPP Performance Test Configs 2n-skx"
# algorithm: "table_merged_details"
-# output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
+# output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/"
# columns:
# - title: " |prein| Test Name |preout| "
# data: "data name"
@@ -4844,7 +4844,7 @@
- type: "table"
title: "Test configuration - VPP Performance Test Configs 2n-clx"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}/vpp_test_configuration_2n_clx"
+ output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4861,7 +4861,7 @@
- type: "table"
title: "Test configuration - VPP Performance Test Configs 3n-tsh"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}/vpp_test_configuration_3n_tsh"
+ output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4878,7 +4878,7 @@
- type: "table"
title: "Test configuration - VPP Performance Test Configs 3n-dnv"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}/vpp_test_configuration_3n_dnv"
+ output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4895,7 +4895,7 @@
- type: "table"
title: "Test configuration - VPP Performance Test Configs 2n-dnv"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
+ output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4912,7 +4912,7 @@
- type: "table"
title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
algorithm: "table_oper_data_html"
- output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
+ output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/"
data: "vpp-perf-results-3n-hsw"
filter: "all"
@@ -4920,7 +4920,7 @@
#- type: "table"
# title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
# algorithm: "table_oper_data_html"
-# output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_test_operational_3n_skx"
+# output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/"
# data: "vpp-perf-results-3n-skx"
# filter: "all"
#
@@ -4928,7 +4928,7 @@
#- type: "table"
# title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
# algorithm: "table_oper_data_html"
-# output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_test_operational_2n_skx"
+# output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/"
# data: "vpp-perf-results-2n-skx"
# filter: "all"
@@ -4936,7 +4936,7 @@
- type: "table"
title: "Test Operational Data - VPP Performance Operational Data 2n-clx"
algorithm: "table_oper_data_html"
- output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}/vpp_test_operational_2n_clx"
+ output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}/"
data: "vpp-perf-results-2n-clx"
filter: "all"
@@ -4944,7 +4944,7 @@
- type: "table"
title: "Test Operational Data - VPP Performance Operational Data 3n-tsh"
algorithm: "table_oper_data_html"
- output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}/vpp_test_operational_3n_tsh"
+ output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}/"
data: "vpp-perf-results-3n-tsh"
filter: "all"
@@ -4952,7 +4952,7 @@
- type: "table"
title: "Test Operational Data - VPP Performance Operational Data 3n-dnv"
algorithm: "table_oper_data_html"
- output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/vpp_test_operational_3n_dnv"
+ output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/"
data: "vpp-perf-results-3n-dnv"
filter: "all"
@@ -4960,7 +4960,7 @@
- type: "table"
title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
algorithm: "table_oper_data_html"
- output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
+ output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/"
data: "vpp-perf-results-2n-dnv"
filter: "all"
@@ -4968,7 +4968,7 @@
- type: "table"
title: "Detailed Test Results - VPP MRR Results 3n-hsw"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
+ output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -4985,7 +4985,7 @@
#- type: "table"
# title: "Detailed Test Results - VPP MRR Results 3n-skx"
# algorithm: "table_merged_details"
-# output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
+# output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/"
# columns:
# - title: " |prein| Test Name |preout| "
# data: "data name"
@@ -5002,7 +5002,7 @@
#- type: "table"
# title: "Detailed Test Results - VPP MRR Results 2n-skx"
# algorithm: "table_merged_details"
-# output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
+# output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/"
# columns:
# - title: " |prein| Test Name |preout| "
# data: "data name"
@@ -5019,7 +5019,7 @@
- type: "table"
title: "Detailed Test Results - VPP MRR Results 2n-clx"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/vpp_mrr_results_2n_clx"
+ output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5036,7 +5036,7 @@
- type: "table"
title: "Detailed Test Results - VPP MRR Results 3n-tsh"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
+ output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5053,7 +5053,7 @@
- type: "table"
title: "Detailed Test Results - VPP MRR Results 3n-dnv"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}/vpp_mrr_results_3n_dnv"
+ output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5070,7 +5070,7 @@
- type: "table"
title: "Detailed Test Results - VPP MRR Results 2n-dnv"
algorithm: "table_merged_details"
- output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+ output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5087,7 +5087,7 @@
- type: "table"
title: "Test configuration - VPP MRR Test Configs 3n-hsw"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
+ output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5104,7 +5104,7 @@
#- type: "table"
# title: "Test configuration - VPP MRR Test Configs 3n-skx"
# algorithm: "table_merged_details"
-# output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
+# output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/"
# columns:
# - title: " |prein| Test Name |preout| "
# data: "data name"
@@ -5121,7 +5121,7 @@
#- type: "table"
# title: "Test configuration - VPP MRR Test Configs 2n-skx"
# algorithm: "table_merged_details"
-# output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
+# output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/"
# columns:
# - title: " |prein| Test Name |preout| "
# data: "data name"
@@ -5138,7 +5138,7 @@
- type: "table"
title: "Test configuration - VPP MRR Test Configs 2n-clx"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}/vpp_mrr_test_configuration_2n_clx"
+ output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5155,7 +5155,7 @@
- type: "table"
title: "Test configuration - VPP MRR Test Configs 3n-tsh"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
+ output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5172,7 +5172,7 @@
- type: "table"
title: "Test configuration - VPP MRR Test Configs 3n-dnv"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}/vpp_mrr_test_configuration_3n_dnv"
+ output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5189,7 +5189,7 @@
- type: "table"
title: "Test configuration - VPP MRR Test Configs 2n-dnv"
algorithm: "table_merged_details"
- output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
+ output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/"
columns:
- title: " |prein| Test Name |preout| "
data: "data name"
@@ -5764,27 +5764,37 @@
filter: "all"
data-start-level: 4
order-chapters:
- - "l2"
- - "ip4"
- - "ip6"
- - "srv6"
- - "ip4_tunnels"
- - "ip6_tunnels"
- - "vm_vhost"
- - "container_memif"
- - "crypto"
- - "vts"
- - "lb"
- - "nfv_density"
- - "hoststack"
- order-sub-chapters:
- - "2n-skx"
- - "3n-skx"
- - "2n-clx"
- - "3n-hsw"
- - "3n-tsh"
- - "2n-dnv"
- - "3n-dnv"
+ level-1:
+ - "l2"
+ - "ip4"
+ - "ip6"
+ - "srv6"
+ - "ip4_tunnels"
+ - "ip6_tunnels"
+ - "vm_vhost"
+ - "container_memif"
+ - "crypto"
+ - "vts"
+ - "lb"
+ - "nfv_density"
+ - "hoststack"
+ level-2:
+ - "2n-skx"
+ - "3n-skx"
+ - "2n-clx"
+ - "3n-hsw"
+ - "3n-tsh"
+ - "2n-dnv"
+ - "3n-dnv"
+ level-3:
+ - "xl710"
+ - "x520"
+ - "xxv710"
+ - "x710"
+ - "x553"
+ - "cx556a"
+ - "vic1227"
+ - "vic1385"
# VPP Performance Configuration
- type: "file"
@@ -5810,27 +5820,37 @@
filter: "all"
data-start-level: 4
order-chapters:
- - "l2"
- - "ip4"
- - "ip6"
- - "srv6"
- - "ip4_tunnels"
- - "ip6_tunnels"
- - "vm_vhost"
- - "container_memif"
- - "crypto"
- - "vts"
- - "lb"
- - "nfv_density"
- - "hoststack"
- order-sub-chapters:
- - "2n-skx"
- - "3n-skx"
- - "2n-clx"
- - "3n-hsw"
- - "3n-tsh"
- - "2n-dnv"
- - "3n-dnv"
+ level-1:
+ - "l2"
+ - "ip4"
+ - "ip6"
+ - "srv6"
+ - "ip4_tunnels"
+ - "ip6_tunnels"
+ - "vm_vhost"
+ - "container_memif"
+ - "crypto"
+ - "vts"
+ - "lb"
+ - "nfv_density"
+ - "hoststack"
+ level-2:
+ - "2n-skx"
+ - "3n-skx"
+ - "2n-clx"
+ - "3n-hsw"
+ - "3n-tsh"
+ - "2n-dnv"
+ - "3n-dnv"
+ level-3:
+ - "xl710"
+ - "x520"
+ - "xxv710"
+ - "x710"
+ - "x553"
+ - "cx556a"
+ - "vic1227"
+ - "vic1385"
# VPP Performance Operational
- type: "file"
@@ -5856,27 +5876,37 @@
filter: "all"
data-start-level: 4
order-chapters:
- - "l2"
- - "ip4"
- - "ip6"
- - "srv6"
- - "ip4_tunnels"
- - "ip6_tunnels"
- - "vm_vhost"
- - "container_memif"
- - "crypto"
- - "vts"
- - "lb"
- - "nfv_density"
- - "hoststack"
- order-sub-chapters:
- - "2n-skx"
- - "3n-skx"
- - "2n-clx"
- - "3n-hsw"
- - "3n-tsh"
- - "2n-dnv"
- - "3n-dnv"
+ level-1:
+ - "l2"
+ - "ip4"
+ - "ip6"
+ - "srv6"
+ - "ip4_tunnels"
+ - "ip6_tunnels"
+ - "vm_vhost"
+ - "container_memif"
+ - "crypto"
+ - "vts"
+ - "lb"
+ - "nfv_density"
+ - "hoststack"
+ level-2:
+ - "2n-skx"
+ - "3n-skx"
+ - "2n-clx"
+ - "3n-hsw"
+ - "3n-tsh"
+ - "2n-dnv"
+ - "3n-dnv"
+ level-3:
+ - "xl710"
+ - "x520"
+ - "xxv710"
+ - "x710"
+ - "x553"
+ - "cx556a"
+ - "vic1227"
+ - "vic1385"
# VPP MRR Results
- type: "file"
@@ -5902,27 +5932,37 @@
filter: "all"
data-start-level: 4
order-chapters:
- - "l2"
- - "ip4"
- - "ip6"
- - "srv6"
- - "ip4_tunnels"
- - "ip6_tunnels"
- - "vm_vhost"
- - "container_memif"
- - "crypto"
- - "vts"
- - "lb"
- - "nfv_density"
- - "hoststack"
- order-sub-chapters:
- - "2n-skx"
- - "3n-skx"
- - "2n-clx"
- - "3n-hsw"
- - "3n-tsh"
- - "2n-dnv"
- - "3n-dnv"
+ level-1:
+ - "l2"
+ - "ip4"
+ - "ip6"
+ - "srv6"
+ - "ip4_tunnels"
+ - "ip6_tunnels"
+ - "vm_vhost"
+ - "container_memif"
+ - "crypto"
+ - "vts"
+ - "lb"
+ - "nfv_density"
+ - "hoststack"
+ level-2:
+ - "2n-skx"
+ - "3n-skx"
+ - "2n-clx"
+ - "3n-hsw"
+ - "3n-tsh"
+ - "2n-dnv"
+ - "3n-dnv"
+ level-3:
+ - "xl710"
+ - "x520"
+ - "xxv710"
+ - "x710"
+ - "x553"
+ - "cx556a"
+ - "vic1227"
+ - "vic1385"
# VPP MRR Configuration
- type: "file"
@@ -5948,27 +5988,37 @@
filter: "all"
data-start-level: 4
order-chapters:
- - "l2"
- - "ip4"
- - "ip6"
- - "srv6"
- - "ip4_tunnels"
- - "ip6_tunnels"
- - "vm_vhost"
- - "container_memif"
- - "crypto"
- - "vts"
- - "lb"
- - "nfv_density"
- - "hoststack"
- order-sub-chapters:
- - "2n-skx"
- - "3n-skx"
- - "2n-clx"
- - "3n-hsw"
- - "3n-tsh"
- - "2n-dnv"
- - "3n-dnv"
+ level-1:
+ - "l2"
+ - "ip4"
+ - "ip6"
+ - "srv6"
+ - "ip4_tunnels"
+ - "ip6_tunnels"
+ - "vm_vhost"
+ - "container_memif"
+ - "crypto"
+ - "vts"
+ - "lb"
+ - "nfv_density"
+ - "hoststack"
+ level-2:
+ - "2n-skx"
+ - "3n-skx"
+ - "2n-clx"
+ - "3n-hsw"
+ - "3n-tsh"
+ - "2n-dnv"
+ - "3n-dnv"
+ level-3:
+ - "xl710"
+ - "x520"
+ - "xxv710"
+ - "x710"
+ - "x553"
+ - "cx556a"
+ - "vic1227"
+ - "vic1385"
# VPP Device Results - Ubuntu
- type: "file"