X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=0fd89e80d5df0e1628245c7b07fe816a63721a24;hb=a8a9827ea12122026190f9c7a590a8af7f92d772;hp=a2548856cea4c0b2698feed4a96d0e20c89f1172;hpb=c81eac1e36b37c78f144a4218c231da846a908f6;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index a2548856ce..0fd89e80d5 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -423,6 +423,7 @@
         - 4   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
+        - 10  # NDRPDR sel
 
     plot-vpp-hdrh-lat-3n-tsh:
       csit-vpp-perf-verify-2001-3n-tsh:
@@ -435,6 +436,8 @@
         - 5   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
 
     plot-dpdk-hdrh-lat-3n-tsh:
       csit-dpdk-perf-verify-2001-3n-tsh:
@@ -535,6 +538,16 @@
         - 18  # NDRPDR full
         - 20  # NDRPDR full
         - 28  # NDRPDR full
+        - 35  # NDRPDR full
+        - 42  # NDRPDR full
+        - 46  # NDRPDR full
+        - 47  # NDRPDR full
+        - 48  # NDRPDR full
+        - 49  # NDRPDR full
+        - 50  # NDRPDR full
+        - 51  # NDRPDR full
+        - 54  # NDRPDR full
+        - 58  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       # TODO: Replace
@@ -565,6 +578,7 @@
         - 23  # NDRPDR full
         - 24  # NDRPDR full
         - 25  # NDRPDR full
+        - 26  # NDRPDR full
 
     vpp-perf-results-2n-dnv:
       csit-vpp-perf-verify-2001-2n-dnv:
@@ -598,10 +612,8 @@
         - 69  # MRR sel
 
     vpp-mrr-results-3n-tsh:
-      # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-tsh:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 17  # MRR sel
+      csit-vpp-perf-verify-2001-3n-tsh:
+        - 9   # MRR sel
 
     vpp-mrr-results-3n-dnv:
       csit-vpp-perf-verify-2001-3n-dnv:
@@ -852,6 +864,7 @@
         - 4   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
+        - 10  # NDRPDR sel
     vpp-performance-changes-3n-tsh:
       - "vpp-performance-changes-3n-tsh-ref"
       - "vpp-performance-changes-3n-tsh-cmp"
@@ -961,10 +974,8 @@
       csit-vpp-perf-verify-1908-3n-tsh:
         - 17  # MRR sel
     vpp-performance-changes-3n-tsh-mrr-cmp:
-      # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-tsh:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 17  # MRR sel
+      csit-vpp-perf-verify-2001-3n-tsh:
+        - 9   # MRR sel
     vpp-performance-changes-3n-tsh-mrr:
       - "vpp-performance-changes-3n-tsh-mrr-ref"
       - "vpp-performance-changes-3n-tsh-mrr-cmp"
@@ -1975,6 +1986,16 @@
       - 18  # NDRPDR full
       - 20  # NDRPDR full
       - 28  # NDRPDR full
+      - 35  # NDRPDR full
+      - 42  # NDRPDR full
+      - 46  # NDRPDR full
+      - 47  # NDRPDR full
+      - 48  # NDRPDR full
+      - 49  # NDRPDR full
+      - 50  # NDRPDR full
+      - 51  # NDRPDR full
+      - 54  # NDRPDR full
+      - 58  # NDRPDR full
 
 #    csit-vpp-perf-verify-1904-3n-skx:
 #      - 7   # MRR sel
@@ -2096,6 +2117,8 @@
       - 4   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 9   # MRR sel
 
     csit-vpp-perf-verify-1908-3n-dnv:
       - 6   # NDRPDR sel
@@ -2128,6 +2151,7 @@
       - 23  # NDRPDR full
       - 24  # NDRPDR full
       - 25  # NDRPDR full
+      - 26  # NDRPDR full
 
     csit-vpp-perf-verify-1908-2n-dnv:
       - 1   # NDRPDR sel
@@ -2326,6 +2350,8 @@
       - 5   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
 
     csit-vpp-device-2001-ubuntu1804-1n-skx:
       - 57
@@ -2335,7 +2361,6 @@
   format:
     html:
     - full
-# TODO: Enable for release runs:
 #    pdf:
 #    - minimal
 
@@ -4137,7 +4162,7 @@
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -4156,7 +4181,7 @@
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -4175,7 +4200,7 @@
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -4194,7 +4219,7 @@
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -4213,7 +4238,7 @@
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -4232,7 +4257,7 @@
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -4251,7 +4276,7 @@
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -4526,24 +4551,24 @@
 #  - "parent"
 #  - "msg"
 
-## 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"
-#  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'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "msg"
+# 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"
+  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'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-dnv
 - type: "table"
@@ -4659,24 +4684,24 @@
 #  - "name"
 #  - "conf-history"
 
-## 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"
-#  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
-#  columns:
-#  - title: "Name"
-#    data: "data name"
-#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
-#    data: "data conf-history"
-#  rows: "generated"
-#  data: "vpp-mrr-results-3n-tsh"
-#  filter: "'MRR'"
-#  parameters:
-#  - "parent"
-#  - "name"
-#  - "conf-history"
+# 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"
+  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
+  columns:
+  - title: "Name"
+    data: "data name"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
+  rows: "generated"
+  data: "vpp-mrr-results-3n-tsh"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-dnv
 - type: "table"
@@ -5144,7 +5169,7 @@
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -5163,7 +5188,7 @@
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -5182,7 +5207,7 @@
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -5201,7 +5226,7 @@
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
-#  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -5220,7 +5245,7 @@
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -5239,7 +5264,7 @@
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -5258,7 +5283,7 @@
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
-  - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| Two sets of Uni-Dir Latency Percentiles in uSec at %PDR load: |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, 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"
@@ -5277,7 +5302,7 @@
   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"
+  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"
@@ -5287,82 +5312,82 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+#  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: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+#  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: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+#  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: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+  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: "not 'CFS_OPT'"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5372,14 +5397,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5389,14 +5414,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5406,82 +5431,82 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+#  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: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+#  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: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+#  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: "not 'CFS_OPT'"
+#  filter: "all"
 #  parameters:
 #  - "name"
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+  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: "not 'CFS_OPT'"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5491,14 +5516,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5508,91 +5533,91 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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'))"
-  data-start-level: 3
+  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"
+#  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: "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"
+#  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: "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"
+#  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: "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"
+  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: "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"
+  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'"
-  data-start-level: 3
+  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"
+  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'"
-  data-start-level: 3
+  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"
+  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"
@@ -5602,14 +5627,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+#  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"
@@ -5619,14 +5644,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+#  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"
@@ -5636,14 +5661,14 @@
 #  - "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"
+#  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"
@@ -5653,31 +5678,31 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  data-start-level:
 
-## 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"
-#  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
+# 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"
+  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"
+  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"
@@ -5687,14 +5712,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5704,14 +5729,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5721,14 +5746,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+#  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"
@@ -5738,14 +5763,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+#  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"
@@ -5755,14 +5780,14 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
+#  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"
@@ -5772,31 +5797,31 @@
 #  - "doc"
 #  - "level"
 #  - "parent"
-#  data-start-level: 3
+#  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"
-#  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
+# 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"
+  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"
+  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"
@@ -5806,14 +5831,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5823,14 +5848,14 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  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"
+  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"
@@ -5840,14 +5865,14 @@
   - "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"
+  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"
@@ -5857,14 +5882,14 @@
   - "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"
+  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"
@@ -5874,14 +5899,14 @@
   - "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"
+#  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"
@@ -5891,14 +5916,14 @@
 #  - "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"
+#  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"
@@ -5908,14 +5933,14 @@
 #  - "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"
+#  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"
@@ -5925,14 +5950,14 @@
 #  - "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"
+  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"
@@ -5942,14 +5967,14 @@
   - "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"
+  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"
@@ -5959,14 +5984,14 @@
   - "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"
+  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"
@@ -5976,7 +6001,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 4
 
 ################################################################################
 ###                                P L O T S                                 ###