Report: Detailed test results

Change-Id: I9af4bc9de4f4606449fd257c4321d9cd980d5f01
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/resources/tools/presentation/generator_files.py b/resources/tools/presentation/generator_files.py
index d6c7546..47683ea 100644 (file)
--- a/resources/tools/presentation/generator_files.py
+++ b/resources/tools/presentation/generator_files.py
@@ -88,7 +88,12 @@ def file_test_results(file_spec, input_data, frmt=u"rst"):
     """
 
     base_file_name = f"{file_spec[u'output-file']}"
-    rst_header = file_spec.get(u"file-header", u"")
+    rst_header = (
+        u"\n"
+        u".. |br| raw:: html\n\n    <br />\n\n\n"
+        u".. |prein| raw:: html\n\n    <pre>\n\n\n"
+        u".. |preout| raw:: html\n\n    </pre>\n\n"
+    )
     start_lvl = file_spec.get(u"data-start-level", 4)
 
     logging.info(f"  Generating the file {base_file_name} ...")

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 15ed2c5..d6b234e 100644 (file)
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -267,90 +267,6 @@ def table_oper_data_html(table, input_data):
     logging.info(u"  Done.")
 
 
-def table_details(table, input_data):
-    """Generate the table(s) with algorithm: table_detailed_test_results
-    specified in the specification file.
-
-    :param table: Table to generate.
-    :param input_data: Data to process.
-    :type table: pandas.Series
-    :type input_data: InputData
-    """
-
-    logging.info(f"  Generating the table {table.get(u'title', u'')} ...")
-
-    # Transform the data
-    logging.info(
-        f"    Creating the data set for the {table.get(u'type', u'')} "
-        f"{table.get(u'title', u'')}."
-    )
-    data = input_data.filter_data(table)
-
-    # Prepare the header of the tables
-    header = list()
-    for column in table[u"columns"]:
-        header.append(
-            u'"{0}"'.format(str(column[u"title"]).replace(u'"', u'""'))
-        )
-
-    # Generate the data for the table according to the model in the table
-    # specification
-    job = list(table[u"data"].keys())[0]
-    build = str(table[u"data"][job][0])
-    try:
-        suites = input_data.suites(job, build)
-    except KeyError:
-        logging.error(
-            u"    No data available. The table will not be generated."
-        )
-        return
-
-    for suite in suites.values:
-        # Generate data
-        suite_name = suite[u"name"]
-        table_lst = list()
-        for test in data[job][build].keys():
-            if data[job][build][test][u"parent"] not in suite_name:
-                continue
-            row_lst = list()
-            for column in table[u"columns"]:
-                try:
-                    col_data = str(data[job][build][test][column[
-                        u"data"].split(" ")[1]]).replace(u'"', u'""')
-                    if column[u"data"].split(u" ")[1] in (u"name", ):
-                        if len(col_data) > 30:
-                            col_data_lst = col_data.split(u"-")
-                            half = int(len(col_data_lst) / 2)
-                            col_data = f"{u'-'.join(col_data_lst[:half])}" \
-                                       f"- |br| " \
-                                       f"{u'-'.join(col_data_lst[half:])}"
-                        col_data = f" |prein| {col_data} |preout| "
-                    elif column[u"data"].split(u" ")[1] in (u"msg", ):
-                        col_data = f" |prein| {col_data} |preout| "
-                    elif column[u"data"].split(u" ")[1] in \
-                        (u"conf-history", u"show-run"):
-                        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:
-                    row_lst.append(u"No data")
-            table_lst.append(row_lst)
-
-        # Write the data to file
-        if table_lst:
-            file_name = (
-                f"{table[u'output-file']}_{suite_name}"
-                f"{table[u'output-file-ext']}"
-            )
-            logging.info(f"      Writing file: {file_name}")
-            with open(file_name, u"wt") as file_handler:
-                file_handler.write(u",".join(header) + u"\n")
-                for item in table_lst:
-                    file_handler.write(u",".join(item) + u"\n")
-
-    logging.info(u"  Done.")
-
-
 def table_merged_details(table, input_data):
     """Generate the table(s) with algorithm: table_merged_details
     specified in the specification file.
@@ -422,10 +338,7 @@ def table_merged_details(table, input_data):
 
         # Write the data to file
         if table_lst:
-            file_name = (
-                f"{table[u'output-file']}_{suite_name}"
-                f"{table[u'output-file-ext']}"
-            )
+            file_name = f"{table[u'output-file']}_{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/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 1ee5753..db1fc5a 100644 (file)
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -421,65 +421,69 @@ class ExecutionChecker(ResultVisitor):
                 robot framework.
             :type in_str_1: str
             :type in_str_2: str
-            :returns: Processed latency string or empty string if a problem
-                occurs.
-            :rtype: tuple(str, str)
+            :returns: Processed latency string or None if a problem occurs.
+            :rtype: tuple
             """
             in_list_1 = in_str_1.split('/', 3)
             in_list_2 = in_str_2.split('/', 3)
 
             if len(in_list_1) != 4 and len(in_list_2) != 4:
-                return u""
+                return None
 
             in_list_1[3] += u"=" * (len(in_list_1[3]) % 4)
             try:
                 hdr_lat_1 = hdrh.histogram.HdrHistogram.decode(in_list_1[3])
             except hdrh.codec.HdrLengthException:
-                return u""
+                return None
 
             in_list_2[3] += u"=" * (len(in_list_2[3]) % 4)
             try:
                 hdr_lat_2 = hdrh.histogram.HdrHistogram.decode(in_list_2[3])
             except hdrh.codec.HdrLengthException:
-                return u""
+                return None
 
             if hdr_lat_1 and hdr_lat_2:
-                hdr_lat_1_50 = hdr_lat_1.get_value_at_percentile(50.0)
-                hdr_lat_1_90 = hdr_lat_1.get_value_at_percentile(90.0)
-                hdr_lat_1_99 = hdr_lat_1.get_value_at_percentile(99.0)
-                hdr_lat_2_50 = hdr_lat_2.get_value_at_percentile(50.0)
-                hdr_lat_2_90 = hdr_lat_2.get_value_at_percentile(90.0)
-                hdr_lat_2_99 = hdr_lat_2.get_value_at_percentile(99.0)
-
-                if (hdr_lat_1_50 + hdr_lat_1_90 + hdr_lat_1_99 +
-                        hdr_lat_2_50 + hdr_lat_2_90 + hdr_lat_2_99):
-                    return (
-                        f"{hdr_lat_1_50} {hdr_lat_1_90} {hdr_lat_1_99}      "
-                        f"{hdr_lat_2_50} {hdr_lat_2_90} {hdr_lat_2_99}"
-                    )
+                hdr_lat = (
+                    hdr_lat_1.get_value_at_percentile(50.0),
+                    hdr_lat_1.get_value_at_percentile(90.0),
+                    hdr_lat_1.get_value_at_percentile(99.0),
+                    hdr_lat_2.get_value_at_percentile(50.0),
+                    hdr_lat_2.get_value_at_percentile(90.0),
+                    hdr_lat_2.get_value_at_percentile(99.0)
+                )
 
-            return u""
+                if all(hdr_lat):
+                    return hdr_lat
+
+            return None
 
         try:
-            pdr_lat_10 = _process_lat(data[u'pdr_lat_10_1'],
-                                      data[u'pdr_lat_10_2'])
-            pdr_lat_50 = _process_lat(data[u'pdr_lat_50_1'],
-                                      data[u'pdr_lat_50_2'])
-            pdr_lat_90 = _process_lat(data[u'pdr_lat_90_1'],
-                                      data[u'pdr_lat_90_2'])
-            pdr_lat_10 = f"\n3. {pdr_lat_10}" if pdr_lat_10 else u""
-            pdr_lat_50 = f"\n4. {pdr_lat_50}" if pdr_lat_50 else u""
-            pdr_lat_90 = f"\n5. {pdr_lat_90}" if pdr_lat_90 else u""
-
-            return (
+            out_msg = (
                 f"1. {(data[u'ndr_low'] / 1e6):.2f}      "
                 f"{data[u'ndr_low_b']:.2f}"
                 f"\n2. {(data[u'pdr_low'] / 1e6):.2f}      "
                 f"{data[u'pdr_low_b']:.2f}"
-                f"{pdr_lat_10}"
-                f"{pdr_lat_50}"
-                f"{pdr_lat_90}"
             )
+            latency = (
+                _process_lat(data[u'pdr_lat_10_1'], data[u'pdr_lat_10_2']),
+                _process_lat(data[u'pdr_lat_50_1'], data[u'pdr_lat_50_2']),
+                _process_lat(data[u'pdr_lat_90_1'], data[u'pdr_lat_90_2'])
+            )
+            if all(latency):
+                max_len = len(str(max((max(item) for item in latency))))
+
+                for idx, lat in enumerate(latency):
+                    if not idx:
+                        out_msg += u"\n"
+                    out_msg += f"\n{idx + 3}. "
+                    for count, itm in enumerate(lat):
+                        if count == 3:
+                            out_msg += u" " * 6
+                        out_msg += u" " * (max_len - len(str(itm)) + 1)
+                        out_msg += str(itm)
+
+            return out_msg
+
         except (AttributeError, IndexError, ValueError, KeyError):
             return msg
 

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 0fd89e8..5e5cfe0 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -4157,16 +4157,14 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-hsw"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
-  rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -4176,16 +4174,14 @@
 #- type: "table"
 #  title: "Detailed Test Results - VPP Performance Results 3n-skx"
 #  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+#  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "vpp-perf-results-3n-skx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "parent"
@@ -4195,16 +4191,14 @@
 #- type: "table"
 #  title: "Detailed Test Results - VPP Performance Results 2n-skx"
 #  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+#  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "parent"
@@ -4214,16 +4208,14 @@
 #- type: "table"
 #  title: "Detailed Test Results - VPP Performance Results 2n-clx"
 #  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
 #  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}/vpp_performance_results_2n_clx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+#  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "vpp-perf-results-2n-clx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "parent"
@@ -4233,16 +4225,14 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-tsh"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}/vpp_performance_results_3n_tsh"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
-  rows: "generated"
   data: "vpp-perf-results-3n-tsh"
-  filter: "not 'CFS_OPT'"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -4252,16 +4242,14 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-dnv"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/vpp_performance_results_3n_dnv"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
-  rows: "generated"
   data: "vpp-perf-results-3n-dnv"
-  filter: "'NDRPDR'"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -4271,16 +4259,14 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-dnv"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
-  rows: "generated"
   data: "vpp-perf-results-2n-dnv"
-  filter: "'NDRPDR'"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -4290,16 +4276,14 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-hsw"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
+  filter: "all"
   parameters:
   - "parent"
   - "name"
@@ -4309,16 +4293,14 @@
 #- type: "table"
 #  title: "Test configuration - VPP Performance Test Configs 3n-skx"
 #  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
 #  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #    data: "data conf-history"
-#  rows: "generated"
 #  data: "vpp-perf-results-3n-skx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "parent"
 #  - "name"
@@ -4328,16 +4310,14 @@
 #- type: "table"
 #  title: "Test configuration - VPP Performance Test Configs 2n-skx"
 #  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
 #  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #    data: "data conf-history"
-#  rows: "generated"
 #  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "parent"
 #  - "name"
@@ -4347,16 +4327,14 @@
 #- type: "table"
 #  title: "Test configuration - VPP Performance Test Configs 2n-clx"
 #  algorithm: "table_merged_details"
-#  output-file-ext: ".csv"
 #  output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}/vpp_test_configuration_2n_clx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #    data: "data conf-history"
-#  rows: "generated"
 #  data: "vpp-perf-results-2n-clx"
-#  filter: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "parent"
 #  - "name"
@@ -4366,16 +4344,14 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-tsh"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}/vpp_test_configuration_3n_tsh"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-perf-results-3n-tsh"
-  filter: "not 'CFS_OPT'"
+  filter: "all"
   parameters:
   - "parent"
   - "name"
@@ -4385,16 +4361,14 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-dnv"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}/vpp_test_configuration_3n_dnv"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-perf-results-3n-dnv"
-  filter: "'NDRPDR'"
+  filter: "all"
   parameters:
   - "parent"
   - "name"
@@ -4404,16 +4378,14 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-dnv"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-perf-results-2n-dnv"
-  filter: "'NDRPDR'"
+  filter: "all"
   parameters:
   - "parent"
   - "name"
@@ -4478,17 +4450,15 @@
 # Detailed Test Results - VPP MRR Results 3n-hsw
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
     data: "data msg"
-  rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -4497,17 +4467,15 @@
 ## Detailed Test Results - VPP MRR Results 3n-skx
 #- type: "table"
 #  title: "Detailed Test Results - VPP MRR Results 3n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "parent"
@@ -4516,17 +4484,15 @@
 ## Detailed Test Results - VPP MRR Results 2n-skx
 #- type: "table"
 #  title: "Detailed Test Results - VPP MRR Results 2n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "vpp-mrr-results-2n-skx"
-#  filter: "'MRR'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "parent"
@@ -4535,17 +4501,15 @@
 ## Detailed Test Results - VPP MRR Results 2n-clx
 #- type: "table"
 #  title: "Detailed Test Results - VPP MRR Results 2n-clx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/vpp_mrr_results_2n_clx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
 #  - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "vpp-mrr-results-2n-clx"
-#  filter: "'MRR'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "parent"
@@ -4554,17 +4518,15 @@
 # Detailed Test Results - VPP MRR Results 3n-tsh
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-tsh"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
     data: "data msg"
-  rows: "generated"
   data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -4573,17 +4535,15 @@
 # Detailed Test Results - VPP MRR Results 3n-dnv
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}/vpp_mrr_results_3n_dnv"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
     data: "data msg"
-  rows: "generated"
   data: "vpp-mrr-results-3n-dnv"
-  filter: "'MRR'"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -4592,17 +4552,15 @@
 # Detailed Test Results - VPP MRR Results 2n-dnv
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
   - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
     data: "data msg"
-  rows: "generated"
   data: "vpp-mrr-results-2n-dnv"
-  filter: "'MRR'"
+  filter: "all"
   parameters:
   - "name"
   - "parent"
@@ -4611,17 +4569,15 @@
 # Test configuration - VPP MRR Test Configs 3n-hsw
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
+  filter: "all"
   parameters:
   - "parent"
   - "name"
@@ -4630,17 +4586,15 @@
 ## Test configuration - VPP MRR Test Configs 3n-skx
 #- type: "table"
 #  title: "Test configuration - VPP MRR Test Configs 3n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #    data: "data conf-history"
-#  rows: "generated"
 #  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
+#  filter: "all"
 #  parameters:
 #  - "parent"
 #  - "name"
@@ -4649,17 +4603,15 @@
 ## Test configuration - VPP MRR Test Configs 2n-skx
 #- type: "table"
 #  title: "Test configuration - VPP MRR Test Configs 2n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #    data: "data conf-history"
-#  rows: "generated"
 #  data: "vpp-mrr-results-2n-skx"
-#  filter: "'MRR'"
+#  filter: "all"
 #  parameters:
 #  - "parent"
 #  - "name"
@@ -4668,17 +4620,15 @@
 ## Test configuration - VPP MRR Test Configs 2n-clx
 #- type: "table"
 #  title: "Test configuration - VPP MRR Test Configs 2n-clx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}/vpp_mrr_test_configuration_2n_clx"
 #  columns:
-#  - title: "Name"
+#  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
 #    data: "data conf-history"
-#  rows: "generated"
 #  data: "vpp-mrr-results-2n-clx"
-#  filter: "'MRR'"
+#  filter: "all"
 #  parameters:
 #  - "parent"
 #  - "name"
@@ -4687,17 +4637,15 @@
 # Test configuration - VPP MRR Test Configs 3n-tsh
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-tsh"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
+  filter: "all"
   parameters:
   - "parent"
   - "name"
@@ -4706,17 +4654,15 @@
 # Test configuration - VPP MRR Test Configs 3n-dnv
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}/vpp_mrr_test_configuration_3n_dnv"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-mrr-results-3n-dnv"
-  filter: "'MRR'"
+  filter: "all"
   parameters:
   - "parent"
   - "name"
@@ -4725,17 +4671,15 @@
 # Test configuration - VPP MRR Test Configs 2n-dnv
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-mrr-results-2n-dnv"
-  filter: "'MRR'"
+  filter: "all"
   parameters:
   - "parent"
   - "name"
@@ -4744,15 +4688,13 @@
 # Detailed Test Results - VPP Device Results - Ubuntu
 - type: "table"
   title: "Detailed Test Results - VPP Device Results - Ubuntu"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "Status"
+  - title: " |prein| Status |preout| "
     data: "data status"
-  rows: "generated"
   data: "vpp-device-results-ubuntu"
   filter: "all"
   parameters:
@@ -4764,15 +4706,13 @@
 # Test configuration - VPP Device Test Configs - Ubuntu
 - type: "table"
   title: "Test configuration - VPP Device Test Configs - Ubuntu"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
   columns:
-  - title: "Name"
+  - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+  - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
     data: "data conf-history"
-  rows: "generated"
   data: "vpp-device-results-ubuntu"
   filter: "all"
   parameters:
@@ -5164,14 +5104,12 @@
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
   algorithm: "table_merged_details"
-  output-file-ext: ".csv"
   output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
-  rows: "generated"
   data: "dpdk-perf-results-3n-hsw"
   filter: "all"
   parameters:
@@ -5182,15 +5120,13 @@
 ## Detailed Test Results - DPDK Performance Results 3n-skx
 #- type: "table"
 #  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+#  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "dpdk-perf-results-3n-skx"
 #  filter: "all"
 #  parameters:
@@ -5201,15 +5137,13 @@
 ## Detailed Test Results - DPDK Performance Results 2n-skx
 #- type: "table"
 #  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+#  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "dpdk-perf-results-2n-skx"
 #  filter: "all"
 #  parameters:
@@ -5220,15 +5154,13 @@
 ## Detailed Test Results - DPDK Performance Results 2n-clx
 #- type: "table"
 #  title: "Detailed Test Results - DPDK Performance Results 2n-clx"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
+#  algorithm: "table_merged_details"
 #  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+#  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
 #    data: "data msg"
-#  rows: "generated"
 #  data: "dpdk-perf-results-2n-clx"
 #  filter: "all"
 #  parameters:
@@ -5239,15 +5171,13 @@
 # Detailed Test Results - DPDK Performance Results 2n-dnv
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
-  rows: "generated"
   data: "dpdk-perf-results-2n-dnv"
   filter: "all"
   parameters:
@@ -5258,15 +5188,13 @@
 # Detailed Test Results - DPDK Performance Results 3n-dnv
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
-  rows: "generated"
   data: "dpdk-perf-results-3n-dnv"
   filter: "all"
   parameters:
@@ -5277,15 +5205,13 @@
 # Detailed Test Results - DPDK Performance Results 3n-tsh
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-tsh"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
+  algorithm: "table_merged_details"
   output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}/dpdk_performance_results_3n_tsh"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, one set per each direction: |br| 3. P50 P90 P99    P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99    P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99    P50 P90 P99 (90% PDR) |preout| "
+  - title: " |prein| Throughput: |br| 1. Mpps      Gbps (NDR) |br| 2. Mpps      Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99      P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99      P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99      P50 P90 P99 (90% PDR) |preout| "
     data: "data msg"
-  rows: "generated"
   data: "dpdk-perf-results-3n-tsh"
   filter: "all"
   parameters:
@@ -5301,238 +5227,140 @@
 - type: "file"
   title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 ## VPP Performance Results 3n-skx
 #- type: "file"
 #  title: "VPP Performance Results 3n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 #
 ## VPP Performance Results 2n-skx
 #- type: "file"
 #  title: "VPP Performance Results 2n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 
 ## VPP Performance Results 2n-clx
 #- type: "file"
 #  title: "VPP Performance Results 2n-clx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,PERF,VPP,2N,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 
 # VPP Performance Results 3n-tsh
 - type: "file"
   title: "VPP Performance Results 3n-tsh"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,TSH]}"
   data: "vpp-perf-results-3n-tsh"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
   data-start-level: 4
 
 # VPP Performance Results 3n-dnv
 - type: "file"
   title: "VPP Performance Results 3n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,DNV]}"
   data: "vpp-perf-results-3n-dnv"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP Performance Results 2n-dnv
 - type: "file"
   title: "VPP Performance Results 2n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
   data: "vpp-perf-results-2n-dnv"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP Performance Configuration 3n-hsw
 - type: "file"
   title: "VPP Performance Configuration 3n-hsw"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 ## VPP Performance Configuration 3n-skx
 #- type: "file"
 #  title: "VPP Performance Configuration 3n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 #
 ## VPP Performance Configuration 2n-skx
 #- type: "file"
 #  title: "VPP Performance Configuration 2n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 
 ## VPP Performance Configuration 2n-clx
 #- type: "file"
 #  title: "VPP Performance Configuration 2n-clx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTC,PERF,VPP,2N,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 
 # VPP Performance Configuration 3n-tsh
 - type: "file"
   title: "VPP Performance Configuration 3n-tsh"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,TSH]}"
   data: "vpp-perf-results-3n-tsh"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
   data-start-level: 4
 
 # VPP Performance Configuration 3n-dnv
 - type: "file"
   title: "VPP Performance Configuration 3n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,DNV]}"
   data: "vpp-perf-results-3n-dnv"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP Performance Configuration 2n-dnv
 - type: "file"
   title: "VPP Performance Configuration 2n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
   data: "vpp-perf-results-2n-dnv"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP Performance Operational Data 3n-hsw
@@ -5540,10 +5368,9 @@
   title: "VPP Performance Operational Data 3n-hsw"
   algorithm: "file_test_results_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
+  filter: "all"
   data-start-level: 4
 
 ## VPP Performance Operational Data 3n-skx
@@ -5551,7 +5378,6 @@
 #  title: "VPP Performance Operational Data 3n-skx"
 #  algorithm: "file_test_results_html"
 #  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
 #  filter: "all"
@@ -5562,7 +5388,6 @@
 #  title: "VPP Performance Operational Data 2n-skx"
 #  algorithm: "file_test_results_html"
 #  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
 #  filter: "all"
@@ -5573,7 +5398,6 @@
 #  title: "VPP Performance Operational Data 2n-clx"
 #  algorithm: "file_test_results_html"
 #  output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTO,PERF,VPP,2N,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
 #  filter: "all"
@@ -5584,7 +5408,6 @@
   title: "VPP Performance Operational Data 3n-tsh"
   algorithm: "file_test_results_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,TSH]}"
   data: "vpp-perf-results-3n-tsh"
   filter: "all"
@@ -5595,10 +5418,9 @@
   title: "VPP Performance Operational Data 3n-dnv"
   algorithm: "file_test_results_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,DNV]}"
   data: "vpp-perf-results-3n-dnv"
-  filter: "'NDRPDR'"
+  filter: "all"
   data-start-level: 4
 
 # VPP Performance Operational Data 2n-dnv
@@ -5606,401 +5428,239 @@
   title: "VPP Performance Operational Data 2n-dnv"
   algorithm: "file_test_results_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
   data: "vpp-perf-results-2n-dnv"
-  filter: "'NDRPDR'"
+  filter: "all"
   data-start-level: 4
 
 # VPP MRR Results 3n-hsw
 - type: "file"
   title: "VPP MRR Results 3n-hsw"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,MRR,VPP,3N,HSW]}"
   data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 ## VPP MRR Results 3n-skx
 #- type: "file"
 #  title: "VPP MRR Results 3n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,MRR,VPP,3N,SKX]}"
 #  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
+#  filter: "all"
 #  data-start-level: 4
 #
 ## VPP MRR Results 2n-skx
 #- type: "file"
 #  title: "VPP MRR Results 2n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,MRR,VPP,2N,SKX]}"
 #  data: "vpp-mrr-results-2n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 
 ## VPP MRR Results 2n-clx
 #- type: "file"
 #  title: "VPP MRR Results 2n-clx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,MRR,VPP,2N,CLX]}"
 #  data: "vpp-mrr-results-2n-clx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level:
+#  data-start-level: 4
 
 # VPP MRR Results 3n-tsh
 - type: "file"
   title: "VPP MRR Results 3n-tsh"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,MRR,VPP,3N,TSH]}"
   data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP MRR Results 3n-dnv
 - type: "file"
   title: "VPP MRR Results 3n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,MRR,VPP,3N,DNV]}"
   data: "vpp-mrr-results-3n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP MRR Results 2n-dnv
 - type: "file"
   title: "VPP MRR Results 2n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
   data: "vpp-mrr-results-2n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP MRR Configuration 3n-hsw
 - type: "file"
   title: "VPP MRR Configuration 3n-hsw"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,MRR,VPP,3N,HSW]}"
   data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 ## VPP MRR Configuration 3n-skx
 #- type: "file"
 #  title: "VPP MRR Configuration 3n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTC,MRR,VPP,3N,SKX]}"
 #  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
+#  filter: "all"
 #  data-start-level: 4
 #
 ## VPP MRR Configuration 2n-skx
 #- type: "file"
 #  title: "VPP MRR Configuration 2n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTC,MRR,VPP,2N,SKX]}"
 #  data: "vpp-mrr-results-2n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
+#  filter: "all"
 #  data-start-level: 4
 
 ## VPP MRR Configuration 2n-clx
 #- type: "file"
 #  title: "VPP MRR Configuration 2n-clx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTC,MRR,VPP,2N,CLX]}"
 #  data: "vpp-mrr-results-2n-clx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
+#  filter: "all"
 #  data-start-level: 4
 
 # VPP MRR Configuration 3n-tsh
 - type: "file"
   title: "VPP MRR Configuration 3n-tsh"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,MRR,VPP,3N,TSH]}"
   data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP MRR Configuration 3n-dnv
 - type: "file"
   title: "VPP MRR Configuration 3n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,MRR,VPP,3N,DNV]}"
   data: "vpp-mrr-results-3n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP MRR Configuration 2n-dnv
 - type: "file"
   title: "VPP MRR Configuration 2n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
   data: "vpp-mrr-results-2n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
+  filter: "all"
   data-start-level: 4
 
 # VPP Device Results - Ubuntu
 - type: "file"
   title: "VPP Device Results - Ubuntu"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
   data: "vpp-device-results-ubuntu"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
   data-start-level: 4
 
 # VPP Device Configuration - Ubuntu
 - type: "file"
   title: "VPP Device Configuration - Ubuntu"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
   data: "vpp-device-results-ubuntu"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
   data-start-level: 4
 
 # DPDK Performance Results 3n-hsw
 - type: "file"
   title: "DPDK Performance Results 3n-hsw"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
   data: "dpdk-perf-results-3n-hsw"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
   data-start-level: 4
 
 ## DPDK Performance Results 3n-skx
 #- type: "file"
 #  title: "DPDK Performance Results 3n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
 #  data: "dpdk-perf-results-3n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 #
 ## DPDK Performance Results 2n-skx
 #- type: "file"
 #  title: "DPDK Performance Results 2n-skx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
 #  data: "dpdk-perf-results-2n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 
 ## DPDK Performance Results 2n-clx
 #- type: "file"
 #  title: "DPDK Performance Results 2n-clx"
 #  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
 #  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
-#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
 #  dir-tables: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
 #  data: "dpdk-perf-results-2n-clx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
 #  data-start-level: 4
 
 # DPDK Performance Results 2n-dnv
 - type: "file"
   title: "DPDK Performance Results 2n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
   data: "dpdk-perf-results-2n-dnv"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
   data-start-level: 4
 
 # DPDK Performance Results 3n-dnv
 - type: "file"
   title: "DPDK Performance Results 3n-dnv"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
   data: "dpdk-perf-results-3n-dnv"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
   data-start-level: 4
 
 # DPDK Performance Results 3n-tsh
 - type: "file"
   title: "DPDK Performance Results 3n-tsh"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
   output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
   data: "dpdk-perf-results-3n-tsh"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
   data-start-level: 4
 
 ################################################################################