X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=03403ff316477daa4d1ccc298ec8e9402324efa7;hb=0f70d751c7a31dc81bc7a1dc9854a07ff8c4b1b8;hp=1a1dcac44b9d2902f45ad9e2df172bacc066e23b;hpb=fbbee8fed197de0831823827916037a5c54c91b5;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 1a1dcac44b..03403ff316 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -438,6 +438,8 @@
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
 
     plot-dpdk-hdrh-lat-3n-tsh:
       csit-dpdk-perf-verify-2001-3n-tsh:
@@ -546,8 +548,13 @@
         - 49  # NDRPDR full
         - 50  # NDRPDR full
         - 51  # NDRPDR full
+        - 53  # NDRPDR full
         - 54  # NDRPDR full
+        - 55  # NDRPDR full
+        - 56  # NDRPDR full
         - 58  # NDRPDR full
+        - 61  # NDRPDR full
+        - 62  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       # TODO: Replace
@@ -1994,8 +2001,13 @@
       - 49  # NDRPDR full
       - 50  # NDRPDR full
       - 51  # NDRPDR full
+      - 53  # NDRPDR full
       - 54  # NDRPDR full
+      - 55  # NDRPDR full
+      - 56  # NDRPDR full
       - 58  # NDRPDR full
+      - 61  # NDRPDR full
+      - 62  # NDRPDR full
 
 #    csit-vpp-perf-verify-1904-3n-skx:
 #      - 7   # MRR sel
@@ -2352,6 +2364,8 @@
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
 
     csit-vpp-device-2001-ubuntu1804-1n-skx:
       - 57
@@ -4157,16 +4171,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 +4188,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 +4205,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 +4222,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 +4239,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 +4256,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 +4273,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 +4290,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 +4307,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 +4324,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 +4341,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 +4358,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 +4375,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 +4392,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 +4464,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 +4481,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 +4498,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 +4515,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 +4532,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 +4549,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 +4566,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 +4583,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 +4600,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 +4617,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 +4634,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 +4651,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 +4668,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 +4685,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 +4702,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 +4720,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 +5118,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 +5134,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 +5151,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 +5168,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 +5185,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 +5202,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 +5219,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,707 +5241,441 @@
 - type: "file"
   title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_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"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}"
   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"
-  data-start-level: 3
+  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]}/vpp_performance_results_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"
+#  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}"
 #  dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
-#  filter: "not 'CFS_OPT'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  filter: "all"
+#  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]}/vpp_performance_results_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"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}"
 #  dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'CFS_OPT'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  filter: "all"
+#  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]}/vpp_performance_results_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"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}"
 #  dir-tables: "{DIR[DTR,PERF,VPP,2N,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
-#  filter: "not 'CFS_OPT'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  filter: "all"
+#  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]}/vpp_performance_results_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"
+  output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,TSH]}"
   data: "vpp-perf-results-3n-tsh"
-  filter: "not 'CFS_OPT'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  filter: "all"
+  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]}/vpp_performance_results_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"
+  output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,DNV]}"
   data: "vpp-perf-results-3n-dnv"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_performance_results_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"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}"
   dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
   data: "vpp-perf-results-2n-dnv"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_performance_configuration_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"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}"
   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"
-  data-start-level: 3
+  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]}/vpp_performance_configuration_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"
+#  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}"
 #  dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
-#  filter: "not 'CFS_OPT'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  filter: "all"
+#  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]}/vpp_performance_configuration_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"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}"
 #  dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'CFS_OPT'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  filter: "all"
+#  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]}/vpp_performance_configuration_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"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}"
 #  dir-tables: "{DIR[DTC,PERF,VPP,2N,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
-#  filter: "not 'CFS_OPT'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  filter: "all"
+#  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]}/vpp_performance_configuration_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"
+  output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,TSH]}"
   data: "vpp-perf-results-3n-tsh"
-  filter: "not 'CFS_OPT'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  filter: "all"
+  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]}/vpp_performance_configuration_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"
+  output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,DNV]}"
   data: "vpp-perf-results-3n-dnv"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_performance_configuration_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"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}"
   dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
   data: "vpp-perf-results-2n-dnv"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  filter: "all"
+  data-start-level: 4
 
 # VPP Performance Operational Data 3n-hsw
 - type: "file"
   title: "VPP Performance Operational Data 3n-hsw"
   algorithm: "file_test_results_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_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"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}"
   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'))"
-  data-start-level: 3
+  filter: "all"
+  data-start-level: 4
 
 ## VPP Performance Operational Data 3n-skx
 #- type: "file"
 #  title: "VPP Performance Operational Data 3n-skx"
 #  algorithm: "file_test_results_html"
-#  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_performance_operational_data_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"
+#  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}"
 #  dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
 #  data: "vpp-perf-results-3n-skx"
-#  filter: "not 'CFS_OPT'"
-#  data-start-level: 3
+#  filter: "all"
+#  data-start-level: 4
 #
 ## VPP Performance Operational Data 2n-skx
 #- type: "file"
 #  title: "VPP Performance Operational Data 2n-skx"
 #  algorithm: "file_test_results_html"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_performance_operational_data_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"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}"
 #  dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
 #  data: "vpp-perf-results-2n-skx"
-#  filter: "not 'CFS_OPT'"
-#  data-start-level: 3
+#  filter: "all"
+#  data-start-level: 4
 
 ## VPP Performance Operational Data 2n-clx
 #- type: "file"
 #  title: "VPP Performance Operational Data 2n-clx"
 #  algorithm: "file_test_results_html"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}/vpp_performance_operational_data_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"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}"
 #  dir-tables: "{DIR[DTO,PERF,VPP,2N,CLX]}"
 #  data: "vpp-perf-results-2n-clx"
-#  filter: "not 'CFS_OPT'"
-#  data-start-level: 3
+#  filter: "all"
+#  data-start-level: 4
 
 # VPP Performance Operational Data 3n-tsh
 - type: "file"
   title: "VPP Performance Operational Data 3n-tsh"
   algorithm: "file_test_results_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}/vpp_performance_operational_data_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"
+  output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,TSH]}"
   data: "vpp-perf-results-3n-tsh"
-  filter: "not 'CFS_OPT'"
-  data-start-level: 3
+  filter: "all"
+  data-start-level: 4
 
 # VPP Performance Operational Data 3n-dnv
 - type: "file"
   title: "VPP Performance Operational Data 3n-dnv"
   algorithm: "file_test_results_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/vpp_performance_operational_data_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"
+  output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,DNV]}"
   data: "vpp-perf-results-3n-dnv"
-  filter: "'NDRPDR'"
-  data-start-level: 3
+  filter: "all"
+  data-start-level: 4
 
 # VPP Performance Operational Data 2n-dnv
 - type: "file"
   title: "VPP Performance Operational Data 2n-dnv"
   algorithm: "file_test_results_html"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_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"
+  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}"
   dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
   data: "vpp-perf-results-2n-dnv"
-  filter: "'NDRPDR'"
-  data-start-level: 3
+  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]}/vpp_mrr_results_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"
+  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}"
   dir-tables: "{DIR[DTR,MRR,VPP,3N,HSW]}"
   data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_mrr_results_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"
+#  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}"
 #  dir-tables: "{DIR[DTR,MRR,VPP,3N,SKX]}"
 #  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/vpp_mrr_results_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"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}"
 #  dir-tables: "{DIR[DTR,MRR,VPP,2N,SKX]}"
 #  data: "vpp-mrr-results-2n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/vpp_mrr_results_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"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}"
 #  dir-tables: "{DIR[DTR,MRR,VPP,2N,CLX]}"
 #  data: "vpp-mrr-results-2n-clx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/vpp_mrr_results_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"
+  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}"
   dir-tables: "{DIR[DTR,MRR,VPP,3N,TSH]}"
   data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_mrr_results_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"
+  output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}"
   dir-tables: "{DIR[DTR,MRR,VPP,3N,DNV]}"
   data: "vpp-mrr-results-3n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_mrr_results_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"
+  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}"
   dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
   data: "vpp-mrr-results-2n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_mrr_configuration_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"
+  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}"
   dir-tables: "{DIR[DTC,MRR,VPP,3N,HSW]}"
   data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_mrr_configuration_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"
+#  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}"
 #  dir-tables: "{DIR[DTC,MRR,VPP,3N,SKX]}"
 #  data: "vpp-mrr-results-3n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/vpp_mrr_configuration_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"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}"
 #  dir-tables: "{DIR[DTC,MRR,VPP,2N,SKX]}"
 #  data: "vpp-mrr-results-2n-skx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/vpp_mrr_configuration_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"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}"
 #  dir-tables: "{DIR[DTC,MRR,VPP,2N,CLX]}"
 #  data: "vpp-mrr-results-2n-clx"
-#  filter: "'MRR'"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/vpp_mrr_configuration_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"
+  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}"
   dir-tables: "{DIR[DTC,MRR,VPP,3N,TSH]}"
   data: "vpp-mrr-results-3n-tsh"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_mrr_configuration_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"
+  output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}"
   dir-tables: "{DIR[DTC,MRR,VPP,3N,DNV]}"
   data: "vpp-mrr-results-3n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_mrr_configuration_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"
+  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}"
   dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
   data: "vpp-mrr-results-2n-dnv"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_device_results_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"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
   dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
   data: "vpp-device-results-ubuntu"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/vpp_device_configuration_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"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
   dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
   data: "vpp-device-results-ubuntu"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/dpdk_performance_results_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"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
   data: "dpdk-perf-results-3n-hsw"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/dpdk_performance_results_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"
+#  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
 #  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
 #  data: "dpdk-perf-results-3n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/dpdk_performance_results_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"
+#  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
 #  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
 #  data: "dpdk-perf-results-2n-skx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/dpdk_performance_results_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"
+#  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
 #  dir-tables: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
 #  data: "dpdk-perf-results-2n-clx"
 #  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  - "parent"
-#  data-start-level: 3
+#  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]}/dpdk_performance_results_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"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
   data: "dpdk-perf-results-2n-dnv"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/dpdk_performance_results_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"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
   data: "dpdk-perf-results-3n-dnv"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  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]}/dpdk_performance_results_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"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
   dir-tables: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
   data: "dpdk-perf-results-3n-tsh"
   filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 ################################################################################
 ###                                P L O T S                                 ###