Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
CSIT-1350: Add new data to 1810 report
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 95833a5..a795b70 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -39,6 +39,7 @@
     DIR[DTR,PERF,COT,3N,HSW]: "{DIR[DTR]}/cot_performance_results_3n_hsw"
     DIR[DTR,FUNC,VPP,UBUNTU]: "{DIR[DTR]}/vpp_functional_results_ubuntu"
     DIR[DTR,FUNC,VPP,CENTOS]: "{DIR[DTR]}/vpp_functional_results_centos"
+    DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTR]}/vpp_device_results_ubuntu"
     DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results"
     DIR[DTR,FUNC,NSHSFC]: "{DIR[DTR]}/nshsfc_functional_results"
     DIR[DTR,FUNC,DMM]: "{DIR[DTR]}/dmm_functional_results"
@@ -54,6 +55,7 @@
     DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
     DIR[DTC,FUNC,VPP,UBUNTU]: "{DIR[DTC]}/vpp_functional_configuration_ubuntu"
     DIR[DTC,FUNC,VPP,CENTOS]: "{DIR[DTC]}/vpp_functional_configuration_centos"
+    DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu"
 
     # Detailed tests operational data
     DIR[DTO]: "{DIR[WORKING,SRC]}/test_operational_data"
@@ -149,6 +151,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     vpp-compare-testbeds:
       csit-vpp-perf-verify-1810-3n-hsw:
@@ -157,6 +162,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
       csit-vpp-perf-verify-1810-3n-skx:
       - 24  # NDRPDR full
       - 10  # NDRPDR sel
@@ -168,6 +176,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     vpp-compare-testbeds-mrr:
       csit-vpp-perf-verify-1810-3n-hsw:
@@ -208,12 +217,14 @@
 
     vpp-perf-results-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
-      # TODO: Replace with full
-      - 8   # NDRPDR sel
+      - 20  # NDRPDR full
+      - 21  # NDRPDR full
+      - 22  # NDRPDR full
+      - 27  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
-      # TODO: Add data
+      - 23  # NDRPDR full
       - 24  # NDRPDR full
 
     vpp-perf-results-2n-skx:
@@ -243,6 +254,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -256,6 +270,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     plot-throughput-speedup-analysis-2n-skx:
       csit-vpp-perf-verify-1810-2n-skx:
@@ -268,6 +283,7 @@
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-hsw:
       csit-vpp-perf-verify-1810-3n-hsw:
@@ -276,6 +292,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1810-3n-skx:
@@ -289,6 +308,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
 
     plot-vpp-throughput-latency-2n-skx:
       csit-vpp-perf-verify-1810-2n-skx:
@@ -301,20 +321,20 @@
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
+      - 27  # NDRPDR sel
 
     plot-vpp-http-server-performance:
-      # TODO: Replace with 1810 data:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 24  # WRK
-      - 25  # WRK
-      - 23  # WRK
-      - 26  # WRK
-      - 27  # WRK
+      csit-vpp-perf-verify-1810-3n-hsw:
       - 28  # WRK
       - 29  # WRK
       - 30  # WRK
+      - 31  # WRK
       - 32  # WRK
+      - 33  # WRK
+      - 34  # WRK
       - 35  # WRK
+      - 36  # WRK
+      - 37  # WRK
 
     # VPP Functional
     vpp-func-results-ubuntu:
@@ -322,7 +342,6 @@
       - 44
 
     vpp-func-results-centos:
-      # TODO: Replace with 1810 data:
       csit-vpp-functional-1810-centos7-virl:
       - 44
 
@@ -332,25 +351,39 @@
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
 
     plot-ligato-throughput-speedup-analysis-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     plot-ligato-throughput-latency-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-ligato-perf-1807-all:
-      - 3   # full ?
-      - 4   # sel
+      csit-ligato-perf-verify-1810-3n-hsw:
+      - 5   # full
+      - 6   # sel
+      - 8   # sel
+      - 9   # sel
+      - 11  # sel
+      - 12  # sel
+      - 13  # sel
+      - 14  # sel
+      - 16  # sel
+      - 17  # sel
+      - 18  # sel
 
     # DPDK Performance
     dpdk-performance-changes:
-      # TODO: Replace with 1810 data:
       csit-dpdk-perf-1804-all:
       - 4
       - 5
@@ -373,88 +406,92 @@
       - 21
       - 22
       - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     dpdk-compare-testbeds:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     dpdk-perf-results-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 12
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1
 
     dpdk-perf-results-3n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-2n-skx:
-      - 10
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3
 
     plot-dpdk-throughput-latency-3n-hsw:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     plot-dpdk-throughput-latency-2n-skx:
-      # TODO: Replace with 1810 data:
-      csit-dpdk-perf-verify-1807-2n-skx:
-      - 1
-      - 2
-      - 3
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
+      csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
@@ -843,10 +880,27 @@
     # TODO: Add data:
     csit-vpp-perf-verify-1810-3n-hsw:
     - 9   # MRR sel
+    - 20  # NDRPDR full
+    - 21  # NDRPDR full
+    - 22  # NDRPDR full
+    - 27  # NDRPDR full
     - 8   # NDRPDR sel
     - 12  # NDRPDR sel
     - 14  # NDRPDR sel
     - 18  # NDRPDR sel
+    - 23  # NDRPDR sel
+    - 25  # NDRPDR sel
+    - 38  # NDRPDR sel
+    - 28  # WRK
+    - 29  # WRK
+    - 30  # WRK
+    - 31  # WRK
+    - 32  # WRK
+    - 33  # WRK
+    - 34  # WRK
+    - 35  # WRK
+    - 36  # WRK
+    - 37  # WRK
     csit-vpp-perf-verify-1807-3n-skx:
     - 31  # MRR full
     - 28  # MRR sel
@@ -877,6 +931,7 @@
     - 11  # MRR sel
     - 12  # MRR sel
     - 13  # MRR sel
+    - 23  # NDRPDR full
     - 24  # NDRPDR full
     - 10  # NDRPDR sel
     - 14  # NDRPDR sel
@@ -887,6 +942,7 @@
     - 20  # NDRPDR sel
     - 21  # NDRPDR sel
     - 22  # NDRPDR sel
+    - 25  # NDRPDR sel
     csit-vpp-perf-verify-1807-2n-skx:
     - 27  # MRR full
     - 31  # MRR sel
@@ -927,6 +983,7 @@
     - 22  # NDRPDR sel
     - 23  # NDRPDR sel
     - 24  # NDRPDR sel
+    - 27  # NDRPDR sel
     csit-vpp-perf-check-1804:
     - 5   # mrr - full
     - 6   # mrr - sel
@@ -939,21 +996,18 @@
     - 20  # mrr - sel
     - 21  # mrr - sel
     - 22  # mrr - sel
-    csit-ligato-perf-1804-all:
-    - 4   # full
-    - 5   # sel
+    csit-ligato-perf-verify-1810-3n-hsw:
+    - 5   # full
     - 6   # sel
-    - 7   # sel
     - 8   # sel
     - 9   # sel
-    - 10  # sel
     - 11  # sel
     - 12  # sel
     - 13  # sel
     - 14  # sel
-    csit-ligato-perf-1807-all:
-    - 3   # full ?
-    - 4   # sel
+    - 16  # sel
+    - 17  # sel
+    - 18  # sel
     csit-dpdk-perf-1804-all:
     - 4
     - 5
@@ -976,6 +1030,17 @@
     - 21
     - 22
     - 23
+    csit-dpdk-perf-verify-1810-3n-hsw:
+    - 1   # NDRPDR sel
+    - 2   # NDRPDR sel
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
     csit-dpdk-perf-verify-1807-3n-skx:
     - 1
     - 2
@@ -987,17 +1052,29 @@
     - 10
     - 11
     - 12
-    csit-dpdk-perf-verify-1807-2n-skx:
-    - 1
-    - 2
-    - 3
-    - 4
-    - 5
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
+    csit-dpdk-perf-verify-1810-3n-skx:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1810-2n-skx:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+
     csit-vpp-functional-1810-ubuntu1604-virl:
     - 44
     csit-vpp-functional-1810-centos7-virl:
@@ -1026,6 +1103,8 @@
 
 ################################################################################
 # VPP
+
+# VPP Performance Changes 1t1c pdr
 -
   type: "table"
   title: "VPP Performance Changes 1t1c pdr"
@@ -1071,6 +1150,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1079,6 +1161,7 @@
   - "parent"
   - "throughput"
 
+# VPP Performance Changes 2t2c pdr
 -
   type: "table"
   title: "VPP Performance Changes 2t2c pdr"
@@ -1124,6 +1207,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1132,6 +1218,7 @@
   - "parent"
   - "throughput"
 
+# VPP Performance Changes 1t1c ndr
 -
   type: "table"
   title: "VPP Performance Changes 1t1c ndr"
@@ -1177,6 +1264,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1185,6 +1275,7 @@
   - "parent"
   - "throughput"
 
+# VPP Performance Changes 2t2c ndr
 -
   type: "table"
   title: "VPP Performance Changes 2t2c ndr"
@@ -1230,6 +1321,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1238,6 +1332,7 @@
   - "parent"
   - "throughput"
 
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 -
   type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
@@ -1251,6 +1346,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
@@ -1264,6 +1362,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR'"
@@ -1272,6 +1371,7 @@
   - "parent"
   - "throughput"
 
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr
 -
   type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
@@ -1285,6 +1385,9 @@
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
@@ -1298,6 +1401,7 @@
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
+      - 25  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR'"
@@ -1306,6 +1410,7 @@
   - "parent"
   - "throughput"
 
+# VPP Performance Changes - 1t1c MRR
 -
   type: "table"
   title: "VPP Performance Changes - 1t1c MRR"
@@ -1352,6 +1457,7 @@
   - "parent"
   - "result"
 
+# VPP Performance Changes - 2t2c MRR
 -
   type: "table"
   title: "VPP Performance Changes - 2t2c MRR"
@@ -1398,6 +1504,7 @@
   - "parent"
   - "result"
 
+# VPP Performance Changes - 4t4c MRR
 -
   type: "table"
   title: "VPP Performance Changes - 4t4c MRR"
@@ -1444,6 +1551,7 @@
   - "parent"
   - "result"
 
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr
 -
   type: "table"
   title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
@@ -1470,6 +1578,7 @@
   - "parent"
   - "result"
 
+# Detailed Test Results - VPP Performance Results 3n-hsw
 -
   type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-hsw"
@@ -1491,6 +1600,7 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 3n-skx
 -
   type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-skx"
@@ -1512,6 +1622,7 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 2n-skx
 -
   type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-skx"
@@ -1533,6 +1644,7 @@
   - "parent"
   - "msg"
 
+# Test configuration - VPP Performance Test Configs 3n-hsw
 -
   type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-hsw"
@@ -1554,6 +1666,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP Performance Test Configs 3n-skx
 -
   type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-skx"
@@ -1575,6 +1688,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP Performance Test Configs 2n-skx
 -
   type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-skx"
@@ -1596,6 +1710,7 @@
   - "name"
   - "vat-history"
 
+# Test Operational Data - VPP Performance Operational Data 3n-hsw
 -
   type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
@@ -1617,6 +1732,7 @@
   - "name"
   - "show-run"
 
+# Test Operational Data - VPP Performance Operational Data 3n-skx
 -
   type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
@@ -1638,6 +1754,7 @@
   - "name"
   - "show-run"
 
+# Test Operational Data - VPP Performance Operational Data 2n-skx
 -
   type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
@@ -1659,6 +1776,7 @@
   - "name"
   - "show-run"
 
+# Detailed Test Results - VPP MRR Results 3n-hsw
 -
   type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-hsw"
@@ -1680,6 +1798,7 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 3n-skx
 -
   type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-skx"
@@ -1701,6 +1820,7 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 2n-skx
 -
   type: "table"
   title: "Detailed Test Results - VPP MRR Results 2n-skx"
@@ -1722,6 +1842,7 @@
   - "parent"
   - "msg"
 
+# Test configuration - VPP MRR Test Configs 3n-hsw
 -
   type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-hsw"
@@ -1743,6 +1864,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP MRR Test Configs 3n-skx
 -
   type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-skx"
@@ -1764,6 +1886,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP MRR Test Configs 2n-skx
 -
   type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-skx"
@@ -1785,6 +1908,7 @@
   - "name"
   - "vat-history"
 
+# Detailed Test Results - VPP Functional Results - Ubuntu
 -
   type: "table"
   title: "Detailed Test Results - VPP Functional Results - Ubuntu"
@@ -1810,6 +1934,7 @@
   - "doc"
   - "status"
 
+# Detailed Test Results - VPP Functional Results - CentOS
 -
   type: "table"
   title: "Detailed Test Results - VPP Functional Results - CentOS"
@@ -1836,6 +1961,7 @@
   - "doc"
   - "status"
 
+# Test configuration - VPP Functional Test Configs - Ubuntu
 -
   type: "table"
   title: "Test configuration - VPP Functional Test Configs - Ubuntu"
@@ -1857,6 +1983,7 @@
   - "name"
   - "vat-history"
 
+# Test configuration - VPP Functional Test Configs - CentOS
 -
   type: "table"
   title: "Test configuration - VPP Functional Test Configs - CentOS"
@@ -1878,6 +2005,7 @@
   - "name"
   - "vat-history"
 
+# Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
 -
   type: "table"
   title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
@@ -1899,28 +2027,78 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Device Results - Ubuntu
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Device Results - Ubuntu"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
+
+# Test configuration - VPP Device Test Configs - Ubuntu
+-
+  type: "table"
+  title: "Test configuration - VPP Device Test Configs - Ubuntu"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
 ################################################################################
-# DPDK
+
+# DPDK Performance Changes 1t1c pdr
 -
   type: "table"
   title: "DPDK Performance Changes 1t1c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-pdr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -1934,6 +2112,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1942,26 +2134,28 @@
   - "parent"
   - "throughput"
 
+# DPDK Performance Changes 2t2c pdr
 -
   type: "table"
   title: "DPDK Performance Changes 2t2c pdr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-pdr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -1975,6 +2169,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1983,26 +2191,28 @@
   - "parent"
   - "throughput"
 
+# DPDK Performance Changes 1t1c ndr
 -
   type: "table"
   title: "DPDK Performance Changes 1t1c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-1t1c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2016,6 +2226,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2024,26 +2248,28 @@
   - "parent"
   - "throughput"
 
+# DPDK Performance Changes 2t2c ndr
 -
   type: "table"
   title: "DPDK Performance Changes 2t2c ndr"
   algorithm: "table_performance_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2t2c-ndr"
+  history:
+    -
+      title: "rls1804"
+      data:
+        csit-dpdk-perf-1804-all:
+        - 4
+        - 5
+        - 6
+        - 7
+        - 8
+        - 9
+        - 10
+        - 11
+        - 12
+        - 13
   reference:
-    title: "rls1804"
-    data:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
-  compare:
     title: "rls1807"
     data:
       csit-dpdk-perf-verify-1807-3n-hsw:
@@ -2057,6 +2283,20 @@
       - 21
       - 22
       - 23
+  compare:
+    title: "rls1810"
+    data:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   data: "dpdk-performance-changes"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2065,6 +2305,7 @@
   - "parent"
   - "throughput"
 
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 -
   type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
@@ -2073,31 +2314,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2106,6 +2347,7 @@
   - "parent"
   - "throughput"
 
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
 -
   type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
@@ -2114,31 +2356,31 @@
   reference:
     title: "3-Node Hsw"
     data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
+      csit-dpdk-perf-verify-1810-3n-hsw:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1
-      - 2
-      - 3
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
+      csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
   data: "dpdk-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2147,6 +2389,8 @@
   - "parent"
   - "throughput"
 
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr
+# NOTE: Not used in 18.10
 -
   type: "table"
   title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
@@ -2155,6 +2399,7 @@
   reference:
     title: "3-Node Hsw"
     data:
+      # TODO: Replace with 1810 data
       csit-dpdk-perf-verify-1807-3n-hsw:
       - 11
       - 12  # full
@@ -2169,6 +2414,7 @@
   compare:
     title: "3-Node Skx"
     data:
+      # TODO: Replace with 1810 data
       csit-dpdk-perf-verify-1807-3n-skx:
       - 1
       - 2
@@ -2186,8 +2432,9 @@
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "result"
 
+# Detailed Test Results - DPDK Performance Results 3n-hsw
 -
   type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
@@ -2209,6 +2456,7 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 3n-skx
 -
   type: "table"
   title: "Detailed Test Results - DPDK Performance Results 3n-skx"
@@ -2230,6 +2478,7 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 2n-skx
 -
   type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-skx"
@@ -2251,7 +2500,6 @@
   - "parent"
   - "msg"
 
-
 ################################################################################
 # HoneyComb
 -
@@ -2340,6 +2588,7 @@
 ###                                F I L E S                                 ###
 ################################################################################
 
+# VPP Performance Results 3n-hsw
 -
   type: "file"
   title: "VPP Performance Results 3n-hsw"
@@ -2357,6 +2606,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Results 3n-skx
 -
   type: "file"
   title: "VPP Performance Results 3n-skx"
@@ -2374,6 +2624,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Results 2n-skx
 -
   type: "file"
   title: "VPP Performance Results 2n-skx"
@@ -2391,6 +2642,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Configuration 3n-hsw
 -
   type: "file"
   title: "VPP Performance Configuration 3n-hsw"
@@ -2408,6 +2660,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Configuration 3n-skx
 -
   type: "file"
   title: "VPP Performance Configuration 3n-skx"
@@ -2425,6 +2678,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Configuration 2n-skx
 -
   type: "file"
   title: "VPP Performance Configuration 2n-skx"
@@ -2442,6 +2696,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Operational Data 3n-hsw
 -
   type: "file"
   title: "VPP Performance Operational Data 3n-hsw"
@@ -2459,6 +2714,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Operational Data 3n-skx
 -
   type: "file"
   title: "VPP Performance Operational Data 3n-skx"
@@ -2476,6 +2732,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Performance Operational Data 2n-skx
 -
   type: "file"
   title: "VPP Performance Operational Data 2n-skx"
@@ -2493,6 +2750,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Results 3n-hsw
 -
   type: "file"
   title: "VPP MRR Results 3n-hsw"
@@ -2510,6 +2768,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Results 3n-skx
 -
   type: "file"
   title: "VPP MRR Results 3n-skx"
@@ -2527,6 +2786,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Results 2n-skx
 -
   type: "file"
   title: "VPP MRR Results 2n-skx"
@@ -2544,6 +2804,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Configuration 3n-hsw
 -
   type: "file"
   title: "VPP MRR Configuration 3n-hsw"
@@ -2561,6 +2822,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Configuration 3n-skx
 -
   type: "file"
   title: "VPP MRR Configuration 3n-skx"
@@ -2578,6 +2840,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP MRR Configuration 2n-skx
 -
   type: "file"
   title: "VPP MRR Configuration 2n-skx"
@@ -2595,6 +2858,7 @@
   - "parent"
   data-start-level: 3
 
+# VPP Functional Results - Ubuntu
 -
   type: "file"
   title: "VPP Functional Results - Ubuntu"
@@ -2610,8 +2874,9 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 4
+  data-start-level: 3
 
+# VPP Functional Results - CentOS
 -
   type: "file"
   title: "VPP Functional Results - CentOS"
@@ -2628,8 +2893,9 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 4
+  data-start-level: 3
 
+# VPP Functional Configuration - Ubuntu
 -
   type: "file"
   title: "VPP Functional Configuration - Ubuntu"
@@ -2645,8 +2911,9 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 4
+  data-start-level: 3
 
+# VPP Functional Configuration - CentOS
 -
   type: "file"
   title: "VPP Functional Configuration - CentOS"
@@ -2663,8 +2930,45 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 4
+  data-start-level: 3
+
+# 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"
+  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2
+
+# 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"
+  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2
 
+# Container Orchestrated Performance Results 3n-hsw
 -
   type: "file"
   title: "Container Orchestrated Performance Results 3n-hsw"
@@ -2682,6 +2986,7 @@
   - "parent"
   data-start-level: 3
 
+# DPDK Performance Results 3n-hsw
 -
   type: "file"
   title: "DPDK Performance Results 3n-hsw"
@@ -2699,6 +3004,7 @@
   - "parent"
   data-start-level: 3
 
+# DPDK Performance Results 3n-skx
 -
   type: "file"
   title: "DPDK Performance Results 3n-skx"
@@ -2716,6 +3022,7 @@
   - "parent"
   data-start-level: 3
 
+# DPDK Performance Results 2n-skx
 -
   type: "file"
   title: "DPDK Performance Results 2n-skx"
@@ -2733,6 +3040,7 @@
   - "parent"
   data-start-level: 3
 
+# Honeycomb Functional Results
 -
   type: "file"
   title: "Honeycomb Functional Results"
@@ -2751,6 +3059,7 @@
   - "parent"
   data-start-level: 3
 
+# NSH SFC Functional Results
 -
   type: "file"
   title: "NSH SFC Functional Results"
@@ -2769,6 +3078,7 @@
   - "parent"
   data-start-level: 3
 
+# DMM Functional Results
 -
   type: "file"
   title: "DMM Functional Results"
@@ -4218,10 +4528,10 @@
 # Packet Throughput - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -4247,7 +4557,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
@@ -9584,7 +9894,7 @@
            '78B' and
            ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T12' and
+           '4T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -16792,7 +17102,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16826,7 +17136,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16857,7 +17167,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16876,7 +17186,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -16887,7 +17197,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16919,7 +17229,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16936,7 +17246,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -16948,7 +17258,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16978,7 +17288,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -16995,7 +17305,7 @@
   title: "VPP Latency: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr-oacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
@@ -17007,7 +17317,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17097,7 +17407,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17131,7 +17441,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17162,7 +17472,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17181,7 +17491,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17192,7 +17502,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17224,7 +17534,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17241,7 +17551,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17253,7 +17563,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17283,7 +17593,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17300,7 +17610,7 @@
   title: "VPP Latency: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr-oacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17312,7 +17622,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17459,7 +17769,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17493,7 +17803,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17524,7 +17834,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17543,7 +17853,7 @@
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-nat44-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17554,7 +17864,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17586,7 +17896,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17603,7 +17913,7 @@
   title: "VPP Latency: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr-iacl-lat"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr-lat"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
@@ -17615,7 +17925,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17645,7 +17955,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17674,7 +17984,7 @@
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17881,7 +18191,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17909,7 +18219,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -17999,7 +18309,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18027,7 +18337,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18080,7 +18390,7 @@
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           '4t2c' and
+           '4T2C' and
            'VXLAN' and
            'L2BDMACLRN' and
            not 'VHOST' and
@@ -18117,7 +18427,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18145,7 +18455,7 @@
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18530,7 +18840,7 @@
            'LISP' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
@@ -18555,7 +18865,7 @@
            'LISP' and
            not 'VHOST'"
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   sort:
Integration tests