Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Report: Add DPDK comparisons for 2n-skx
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index df0b20b..8f9fd81 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -162,13 +162,19 @@
       # TODO Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     vpp-nic-comparison-3n-hsw:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     vpp-performance-changes-3n-skx:
       csit-vpp-perf-verify-1807-3n-skx:
@@ -195,18 +201,26 @@
       - 25  # NDRPDR sel
       # TODO Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     vpp-nic-comparison-3n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     vpp-performance-changes-2n-skx:
       csit-vpp-perf-verify-1807-2n-skx:
@@ -238,6 +252,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
 
     vpp-nic-comparison-2n-skx:
       # TODO: Add new data
@@ -247,18 +263,27 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
 
     vpp-compare-testbeds:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     vpp-compare-testbeds-mrr:
       # TODO: Add new data
@@ -271,10 +296,14 @@
     vpp-compare-topologies:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
       # TODO: Add new data
       csit-vpp-perf-verify-1901-2n-skx:
       - 5   # NDRPDR sel
@@ -282,6 +311,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
 
     vpp-compare-topologies-mrr:
       # TODO: Add new data
@@ -371,14 +402,16 @@
       - 19  # NDRPDR sel
 
     vpp-perf-results-3n-skx:
-      # TODO: Replace with FULL data
+      # TODO: Add FULL data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
+      - 37  # NDRPDR full
+      - 39  # NDRPDR full
 
     vpp-perf-results-2n-skx:
-      # TODO: Replace with FULL data
+      # TODO: Add FULL data
       csit-vpp-perf-verify-1901-2n-skx:
-      - 13  # NDRPDR sel
+      - 25  # NDRPDR full
+      - 30  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
       # TODO: Replace with FULL data
@@ -399,15 +432,22 @@
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-throughput-speedup-analysis-2n-skx:
       # TODO: Add new data
@@ -417,12 +457,17 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-hsw:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
       # TODO: Replace with new data
@@ -431,34 +476,32 @@
       - 248  # SOAK sel
       - 251  # SOAK sel
 
-    plot-vpp-vsc-2n-skx:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-2n-skx:
-      csit-vpp-perf-verify-master-2n-skx:
-      - 237
-      - 243
-
-    plot-vpp-csc-2n-skx:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-2n-skx:
-      csit-vpp-perf-verify-master-2n-skx:
-      - 226
-      - 231
-      - 233
+    plot-vpp-nfv-2n-skx:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 28  # NFV NDRPDR
+      - 29  # NFV NDRPDR
+      - 32  # NFV NDRPDR
 
-    plot-vpp-csp-2n-skx:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-2n-skx:
-      csit-vpp-perf-verify-master-2n-skx:
-      - 247
+    plot-vpp-nfv-2n-skx-mrr:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 24  # NFV MRR
+      - 26  # NFV MRR
+      - 27  # NFV MRR
+      - 35  # NFV MRR
 
     plot-vpp-throughput-latency-3n-skx:
       # TODO: Add new data
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-vpp-throughput-latency-2n-skx:
       # TODO: Add new data
@@ -468,6 +511,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
 
     plot-vpp-http-server-performance:
       # TODO: Replace with new data
@@ -564,7 +609,13 @@
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
 
     dpdk-performance-changes-3n-skx:
       csit-dpdk-perf-verify-1807-3n-skx:
@@ -590,15 +641,15 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       # TODO: Add new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
 
-    dpdk-compare-testbeds:
-      # TODO: Replace with new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
+    dpdk-performance-changes-2n-skx:
+      csit-dpdk-perf-verify-1810-2n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
@@ -606,29 +657,52 @@
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-3n-hsw:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
 
-    dpdk-compare-topologies:
+    dpdk-compare-testbeds:
       # TODO: Replace with new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # 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
+
+    dpdk-compare-topologies:
+      # TODO: Replace with new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
       # TODO: Add new data
       csit-dpdk-perf-verify-1901-2n-skx:
       - 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
+      - 11  # NDRPDR sel
 
     dpdk-perf-results-3n-hsw:
       # TODO: Replace with FULL data
@@ -637,9 +711,8 @@
 
     dpdk-perf-results-3n-skx:
       # TODO: Replace with new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 2   # NDRPDR sel F
 
     dpdk-perf-results-2n-skx:
       # TODO: Replace with FULL data
@@ -651,33 +724,36 @@
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
       # TODO: Replace with new data
-      # csit-dpdk-perf-verify-1901-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+
+    plot-dpdk-throughput-latency-2n-skx:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
       - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-2n-skx:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 2   # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
-      # TODO: Replace with new data
-      # csit-hc2vpp-verify-func-1901-ubuntu1604:
-      csit-hc2vpp-verify-func-1810-ubuntu1604:
+      csit-hc2vpp-verify-func-1901-ubuntu1604:
       - 3
 
     # NSH SFC Functional
@@ -690,9 +766,8 @@
     # DMM Functional
     dmm-func-results:
       # TODO: Replace with new data
-      # csit-dmm-functional-1901-ubuntu1604-virl:
-      csit-dmm-functional-1810-ubuntu1604-virl:
-      - 1
+      csit-dmm-functional-1901-ubuntu1604-virl:
+      - 2
 
   plot-layouts:
 
@@ -1163,7 +1238,10 @@
     csit-vpp-perf-verify-1901-3n-hsw:
     - 35  # MRR sel
     - 10  # NDRPDR sel
+    - 18  # NDRPDR sel F
     - 19  # NDRPDR sel
+    - 31  # NDRPDR sel
+    - 36  # NDRPDR sel
     csit-vpp-perf-verify-1807-3n-skx:
     - 31  # MRR full
     - 28  # MRR sel
@@ -1207,10 +1285,16 @@
     - 25  # NDRPDR sel
     csit-vpp-perf-verify-1901-3n-skx:
     - 32  # MRR sel
-    - 28  # NDRPDR sel
+    - 37  # NDRPDR full
+    - 39  # NDRPDR full
     - 18  # NDRPDR sel
     - 19  # NDRPDR sel
     - 20  # NDRPDR sel
+    - 28  # NDRPDR sel
+    - 31  # NDRPDR sel
+    - 33  # NDRPDR sel
+    - 36  # NDRPDR sel
+    - 38  # NDRPDR sel
     csit-vpp-perf-verify-1807-2n-skx:
     - 27  # MRR full
     - 31  # MRR sel
@@ -1253,20 +1337,25 @@
     - 27  # NDRPDR sel
     csit-vpp-perf-verify-1901-2n-skx:
     - 22  # MRR sel
+    - 25  # NDRPDR full
+    - 30  # NDRPDR full
     - 5   # NDRPDR sel
     - 10  # NDRPDR sel fails
     - 12  # NDRPDR sel
     - 13  # NDRPDR sel
     - 16  # NDRPDR sel fails
+    - 21  # NDRPDR sel
+    - 23  # NDRPDR sel
+    - 24  # NFV MRR
+    - 26  # NFV MRR
+    - 27  # NFV MRR
+    - 35  # NFV MRR
+    - 28  # NFV NDRPDR
+    - 29  # NFV NDRPDR
+    - 32  # NFV NDRPDR
     csit-vpp-perf-verify-master-2n-skx:
     - 248  # SOAK sel
     - 251  # SOAK sel
-    - 237  # VSC
-    - 226  # CSC
-    - 231  # CSC
-    - 233  # CSC
-    - 243  # VSC
-    - 247  # CSP
     csit-ligato-perf-verify-1810-3n-hsw:
     - 5   # full
     - 6   # sel
@@ -1279,6 +1368,8 @@
     - 16  # sel
     - 17  # sel
     - 18  # sel
+    # TODO: Add new data
+    # csit-ligato-perf-verify-1901-3n-hsw:
     csit-dpdk-perf-verify-1807-3n-hsw:
     - 11
     - 12  # full
@@ -1304,7 +1395,13 @@
     csit-dpdk-perf-verify-1901-3n-hsw:
     - 3   # NDRPDR sel
     - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
     - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
     csit-dpdk-perf-verify-1807-3n-skx:
     - 1   # NDRPDR sel
     - 2   # NDRPDR sel
@@ -1327,19 +1424,31 @@
     - 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-dpdk-perf-verify-1901-3n-skx:
+    - 1   # NDRPDR sel
+    - 2   # 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-dpdk-perf-verify-1901-2n-skx:
     - 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
+    - 11  # NDRPDR sel
     csit-vpp-functional-1901-ubuntu1604-virl:
     - 48
     csit-vpp-functional-1901-centos7-virl:
@@ -1348,9 +1457,9 @@
     - 49
     csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
     - 1
-    csit-dmm-functional-1810-ubuntu1604-virl:
-    - 1
-    csit-hc2vpp-verify-func-1810-ubuntu1604:
+    csit-dmm-functional-1901-ubuntu1604-virl:
+    - 2
+    csit-hc2vpp-verify-func-1901-ubuntu1604:
     - 3
 
 -
@@ -1854,7 +1963,10 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1907,7 +2019,10 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -1960,7 +2075,10 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2013,7 +2131,10 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2062,10 +2183,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2114,10 +2239,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2166,10 +2295,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2218,10 +2351,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2275,6 +2412,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2327,6 +2466,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2379,6 +2520,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2431,6 +2574,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -2451,16 +2596,23 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
@@ -2481,16 +2633,23 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
@@ -2511,16 +2670,23 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
@@ -2541,16 +2707,23 @@
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
   compare:
     title: "3-Node Skx"
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   data: "vpp-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
@@ -2570,10 +2743,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "2-Node Skx"
     data:
@@ -2584,6 +2761,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
   data: "vpp-compare-topologies"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR' and '1C'"
@@ -2603,10 +2782,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "2-Node Skx"
     data:
@@ -2617,6 +2800,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
   data: "vpp-compare-topologies"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR' and '2C'"
@@ -2636,10 +2821,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "2-Node Skx"
     data:
@@ -2650,6 +2839,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
   data: "vpp-compare-topologies"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR' and '1C'"
@@ -2669,10 +2860,14 @@
     data:
       # TODO: Add new data:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 28  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
   compare:
     title: "2-Node Skx"
     data:
@@ -2683,6 +2878,8 @@
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
   data: "vpp-compare-topologies"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR' and '2C'"
@@ -3870,7 +4067,13 @@
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -3921,8 +4124,14 @@
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
-  data: "dpdk-performance-changes-3n-hsw"
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
@@ -3972,7 +4181,13 @@
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4023,7 +4238,13 @@
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
   data: "dpdk-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4070,18 +4291,10 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Replace with new data
-      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
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4128,18 +4341,10 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Replace with new data
-      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
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4186,18 +4391,10 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Replace with new data
-      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
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4244,18 +4441,10 @@
   compare:
     title: "rls1901"
     data:
-      # TODO: Replace with new data
-      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
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4277,22 +4466,20 @@
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
+      - 5   # 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
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-compare-testbeds"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4310,24 +4497,25 @@
   reference:
     title: "3-Node Skx"
     data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
       - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  compare:
-    title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 2   # NDRPDR sel
   data: "dpdk-compare-topologies"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4345,24 +4533,25 @@
   reference:
     title: "3-Node Skx"
     data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
       - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  compare:
-    title: "2-Node Skx"
-    data:
-      # TODO: Add new data
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 2   # NDRPDR sel
   data: "dpdk-compare-topologies"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4384,22 +4573,20 @@
       csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-      - 6   # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      # TODO: Replace with new data
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
+      - 5   # 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
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
   data: "dpdk-compare-testbeds"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
@@ -4451,78 +4638,246 @@
 #  - "parent"
 #  - "result"
 
-# Detailed Test Results - DPDK Performance Results 3n-hsw
--
-  type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "dpdk-perf-results-3n-hsw"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - DPDK Performance Results 3n-skx
+# DPDK Performance Changes 2n-skx 2t1c pdr
 -
   type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "dpdk-perf-results-3n-skx"
-  filter: "all"
+  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
+  reference:
+    title: "rls1810"
+    data:
+      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
+  compare:
+    title: "rls1901"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
-# Detailed Test Results - DPDK Performance Results 2n-skx
+# DPDK Performance Changes 2n-skx 4t2c pdr
 -
   type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "dpdk-perf-results-2n-skx"
-  filter: "all"
+  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
+  reference:
+    title: "rls1810"
+    data:
+      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
+  compare:
+    title: "rls1901"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
-################################################################################
-# HoneyComb
+# DPDK Performance Changes 2n-skx 2t1c ndr
 -
   type: "table"
-  title: "Detailed Test Results - Honeycomb Functional Results"
-  algorithm: "table_details"
+  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
+  reference:
+    title: "rls1810"
+    data:
+      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
+  compare:
+    title: "rls1901"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 2n-skx 4t2c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
+  reference:
+    title: "rls1810"
+    data:
+      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
+  compare:
+    title: "rls1901"
+    data:
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# Detailed Test Results - DPDK Performance Results 3n-hsw
+-
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-hsw"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-skx
+-
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 2n-skx
+-
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-2n-skx"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+################################################################################
+# HoneyComb
+-
+  type: "table"
+  title: "Detailed Test Results - Honeycomb Functional Results"
+  algorithm: "table_details"
   output-file-ext: ".csv"
   output-file: "{DIR[DTR,FUNC,HC]}/hc_functional_results"
   columns:
@@ -5257,7 +5612,7 @@
     layout: "plot-soak-throughput"
 
 ################################################################################
-# Plots - NF Density
+# Plots - NF Density - VSC
 
 -
   type: "plot"
@@ -5265,7 +5620,7 @@
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
-  data: "plot-vpp-vsc-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'VM' and
@@ -5291,7 +5646,7 @@
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
-  data: "plot-vpp-vsc-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'VM' and
@@ -5313,16 +5668,16 @@
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
-  data: "plot-vpp-csc-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
+           'VM' and
            'CHAIN' and
-           '64B' and
+           'IMIX' and
            '2T1C' and
            'MRR'"
   parameters:
@@ -5330,25 +5685,25 @@
   - "name"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
+  x-axis: "X = VNFs per Service Chain"
   y-axis: "Y = Number of Service Chains"
-  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
-  data: "plot-vpp-csc-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
+           'VM' and
            'CHAIN' and
-           '64B' and
+           'IMIX' and
            '4T2C' and
            'MRR'"
   parameters:
@@ -5356,63 +5711,849 @@
   - "name"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
+  x-axis: "X = VNFs per Service Chain"
   y-axis: "Y = Number of Service Chains"
-  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
-  data: "plot-vpp-csp-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '2T1C' and
-           'MRR'"
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
-  data: "plot-vpp-csp-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '4T2C' and
-           'MRR'"
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Pipeline"
-  y-axis: "Y = Number of Service Pipelines"
-  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VM' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots - NF Density - CSC
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots - NF Density - CSP
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
     layout: "plot-service-density"
 
 ################################################################################
@@ -15846,6 +16987,7 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -15878,6 +17020,7 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -15910,6 +17053,7 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -15942,6 +17086,7 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -15975,6 +17120,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16010,6 +17156,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16045,6 +17192,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16080,6 +17228,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16117,6 +17266,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16152,6 +17302,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16187,6 +17338,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16222,6 +17374,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -16258,6 +17411,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -16292,6 +17446,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -16326,6 +17481,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -16360,6 +17516,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -22720,6 +23877,7 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "latency"
@@ -22748,6 +23906,7 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "latency"
@@ -22778,6 +23937,7 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
+           not 'NF_DENSITY' and
            not '2VM'"
   parameters:
   - "latency"
@@ -22808,6 +23968,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -22841,6 +24002,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -22872,6 +24034,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -22904,6 +24067,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -22934,6 +24098,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "latency"
@@ -28322,6 +29487,7 @@
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -28349,6 +29515,7 @@
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
@@ -28377,6 +29544,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -28407,6 +29575,7 @@
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -28439,6 +29608,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -28469,6 +29639,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
@@ -28500,6 +29671,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -28529,6 +29701,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
Integration tests