Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Report: Add DPDK 2n-clx
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index db29fdb..e5ff547 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -140,39 +140,39 @@
         - 48  # NDRPDR sel vhost
         - 49  # NDRPDR sel vhost
         - 52  # NDRPDR sel vhost
-#        - 53  # NDRPDR sel vhost
-#        - 54  # NDRPDR sel vhost
-#        - 55  # NDRPDR sel vhost
-#        - 56  # NDRPDR sel vhost
-#        - 57  # NDRPDR sel vhost
-#        - 58  # NDRPDR sel vhost
-#        - 59  # NDRPDR sel vhost
+        - 53  # NDRPDR sel vhost
+        - 54  # NDRPDR sel vhost
+        - 55  # NDRPDR sel vhost
+        - 56  # NDRPDR sel vhost
+        - 57  # NDRPDR sel vhost
+        - 58  # NDRPDR sel vhost
+        - 59  # NDRPDR sel vhost
 
     replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost:
       csit-vpp-perf-verify-1908-3n-skx:
         - 52  # NDRPDR sel vhost
         - 53  # NDRPDR sel vhost
         - 55  # NDRPDR sel vhost
-#        - 61  # NDRPDR sel vhost
-#        - 62  # NDRPDR sel vhost
-#        - 63  # NDRPDR sel vhost
-#        - 64  # NDRPDR sel vhost
-#        - 65  # NDRPDR sel vhost
-#        - 66  # NDRPDR sel vhost
-#        - 67  # NDRPDR sel vhost
+        - 61  # NDRPDR sel vhost
+        - 62  # NDRPDR sel vhost
+        - 63  # NDRPDR sel vhost
+        - 64  # NDRPDR sel vhost
+        - 65  # NDRPDR sel vhost
+        - 66  # NDRPDR sel vhost
+        - 67  # NDRPDR sel vhost
 
     replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost:
       csit-vpp-perf-verify-1908-2n-skx:
         - 88  # NDRPDR sel vhost
         - 89  # NDRPDR sel vhost
         - 91  # NDRPDR sel vhost
-#        - 92  # NDRPDR sel vhost
-#        - 93  # NDRPDR sel vhost
-#        - 94  # NDRPDR sel vhost
-#        - 95  # NDRPDR sel vhost
-#        - 96  # NDRPDR sel vhost
-#        - 97  # NDRPDR sel vhost
-#        - 98  # NDRPDR sel vhost
+        - 92  # NDRPDR sel vhost
+        - 93  # NDRPDR sel vhost
+        - 94  # NDRPDR sel vhost
+        - 95  # NDRPDR sel vhost
+        - 96  # NDRPDR sel vhost
+        - 97  # NDRPDR sel vhost
+        - 98  # NDRPDR sel vhost
 
     ###########################################################################
     # Plots:
@@ -181,82 +181,97 @@
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
       # TODO: Replace:
-      # csit-vpp-perf-verify-2001-3n-hsw:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-hsw:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
 
     plot-vpp-hdrh-lat-3n-hsw:
       # TODO: Replace the data
-      # This data is only an example
+      csit-vpp-perf-verify-2001-3n-hsw:
+        - 4  # NDRPDR sel RC2
+
+    plot-vpp-nfv-3n-hsw-ndrpdr:
+      # TODO: Replace:
+      csit-vpp-perf-verify-2001-3n-hsw:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
+
+    plot-vpp-nfv-3n-hsw-mrr:
+      # TODO: Replace:
       # csit-vpp-perf-verify-2001-3n-hsw:
-      csit-vpp-perf-verify-master-3n-hsw:
-        - 595
+      csit-vpp-perf-verify-1908-3n-hsw:
+        - 39  # MRR sel
 
     plot-dpdk-throughput-latency-3n-hsw:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2001-3n-hsw:
-      csit-dpdk-perf-verify-1908-3n-hsw:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
+      csit-dpdk-perf-verify-2001-3n-hsw:
         - 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-hdrh-lat-3n-hsw:
-      # TODO: Replace the data
-      # This data is only an example
-      # csit-dpdk-perf-verify-2001-3n-hsw:
-      csit-dpdk-perf-verify-master-3n-hsw:
-        - 13
+      csit-dpdk-perf-verify-2001-3n-hsw:
+        - 13  # NDRPDR sel
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
       # TODO: Replace the data
-      # csit-vpp-perf-verify-2001-3n-skx:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-skx:
+        - 2  # NDRPDR sel RC2
+        - 3  # NDRPDR sel RC2
 
     plot-vpp-hdrh-lat-3n-skx:
       # TODO: Replace the data
-      # This data is only an example
+      csit-vpp-perf-verify-2001-3n-skx:
+        - 3  # NDRPDR sel RC2
+
+    plot-vpp-nfv-3n-skx-ndrpdr:
+      # TODO: Replace the data
+      csit-vpp-perf-verify-2001-3n-skx:
+        - 2  # NDRPDR sel RC2
+        - 3  # NDRPDR sel RC2
+
+    plot-vpp-nfv-3n-skx-mrr:
+      # TODO: Replace
       # csit-vpp-perf-verify-2001-3n-skx:
-      csit-vpp-perf-verify-master-3n-skx:
-        - 299
+      csit-vpp-perf-verify-1908-3n-skx:
+        - 36  # MRR sel
 
     plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Replace the data
-      # csit-dpdk-perf-verify-2001-3n-skx:
-      csit-dpdk-perf-verify-1908-3n-skx:
+      csit-dpdk-perf-verify-2001-3n-skx:
+        - 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-hdrh-lat-3n-skx:
-      # TODO: Replace the data
-      # This data is only an example
-      # csit-dpdk-perf-verify-2001-3n-skx:
-      csit-dpdk-perf-verify-master-3n-skx:
-        - 23
+      csit-dpdk-perf-verify-2001-3n-skx:
+        - 1   # NDRPDR sel
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
       # TODO: Replace the data
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
 
     plot-vpp-hdrh-lat-2n-skx:
       # TODO: Replace the data
-      # This data is only an example
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-master-2n-skx:
-        - 930
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
 
     plot-vpp-http-server-performance:
       # TODO: Replace:
@@ -275,11 +290,8 @@
 
     plot-vpp-nfv-2n-skx-ndrpdr:
       # TODO: Replace the data
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 22  # NFV
-        - 31  # NFV
-        - 32  # NFV
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
 
     plot-vpp-nfv-2n-skx-mrr:
       # TODO: Replace the data
@@ -296,85 +308,91 @@
         - 115 # NFV reconf sel
 
     plot-dpdk-throughput-latency-2n-skx:
-      # TODO: Replace the data
-      # csit-dpdk-perf-verify-2001-2n-skx:
-      csit-dpdk-perf-verify-1908-2n-skx:
+      csit-dpdk-perf-verify-2001-2n-skx:
+        - 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-hdrh-lat-2n-skx:
-      # TODO: Replace the data
-      # This data is only an example
-      # csit-dpdk-perf-verify-2001-2n-skx:
-      csit-dpdk-perf-verify-master-2n-skx:
-        - 16
+      csit-dpdk-perf-verify-2001-2n-skx:
+        - 1   # NDRPDR sel
 
     # 2n-clx
 
     plot-vpp-throughput-lat-tsa-2n-clx:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-clx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
 
     plot-vpp-hdrh-lat-2n-clx:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-clx:
-      csit-vpp-perf-verify-master-2n-skx:
-        - 930
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 4  # NDRPDR sel RC2
+
+    plot-vpp-nfv-2n-clx-ndrpdr:
+      # TODO: Replace the data
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
+
+    plot-vpp-nfv-2n-clx-mrr:
+      # TODO: Replace the data
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
 
     plot-dpdk-throughput-latency-2n-clx:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-2n-clx:
-      csit-dpdk-perf-verify-1908-2n-skx:
+      csit-dpdk-perf-verify-2001-2n-clx:
+        - 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-hdrh-lat-2n-clx:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-2n-clx:
-      csit-dpdk-perf-verify-master-2n-skx:
-        - 16
+      csit-dpdk-perf-verify-2001-2n-clx:
+        - 1   # NDRPDR sel
 
     # 3n-tsh
 
     plot-vpp-throughput-lat-tsa-3n-tsh:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-tsh:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-tsh:
+        - 1   # NDRPDR sel RC2
 
     plot-vpp-hdrh-lat-3n-tsh:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-tsh:
-      csit-vpp-perf-verify-master-3n-tsh:
-        - 25
+      csit-vpp-perf-verify-2001-3n-tsh:
+        - 1   # NDRPDR sel RC2
 
     # 3n-dnv
 
     plot-vpp-throughput-lat-tsa-3n-dnv:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-dnv:
-      csit-vpp-perf-verify-1908-3n-dnv:
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-dnv:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
 
     # 2n-dnv
 
     plot-vpp-throughput-lat-tsa-2n-dnv:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-dnv:
-      csit-vpp-perf-verify-1908-2n-dnv:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-dnv:
+        - 2   # NDRPDR sel RC2
+        - 3   # NDRPDR sel RC2
 
     ###########################################################################
     # Simple tables (only one data set):
@@ -383,19 +401,14 @@
 
     vpp-nic-comparison-3n-skx:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-skx:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-skx:
+        - 2  # NDRPDR sel RC2
+        - 3  # NDRPDR sel RC2
 
     vpp-nic-comparison-2n-skx:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
 
     vpp-nic-comparison-3n-skx-mrr:
       # TODO: Replace
@@ -413,53 +426,38 @@
 
     vpp-perf-results-3n-hsw:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-hsw:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 24  # NDRPDR full
-        - 25  # NDRPDR full
-        - 26  # NDRPDR full
+      csit-vpp-perf-verify-2001-3n-hsw:
+        - 4  # NDRPDR sel RC2
 
     vpp-perf-results-3n-skx:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-skx:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 27  # NDRPDR full
-        - 28  # NDRPDR full
-        - 30  # NDRPDR full
+      csit-vpp-perf-verify-2001-3n-skx:
+        - 3  # NDRPDR sel RC2
 
     vpp-perf-results-2n-skx:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 48  # NDRPDR full
-        - 49  # NDRPDR full
-        - 50  # NDRPDR full
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
 
     vpp-perf-results-2n-clx:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-clx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 48  # NDRPDR full
-        - 49  # NDRPDR full
-        - 50  # NDRPDR full
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 4  # NDRPDR sel RC2
 
     vpp-perf-results-3n-tsh:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-tsh:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 13  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-tsh:
+        - 1   # NDRPDR sel RC2
 
     vpp-perf-results-3n-dnv:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-dnv:
-      csit-vpp-perf-verify-1908-3n-dnv:
-        - 16  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-dnv:
+        - 4   # NDRPDR sel RC2
 
     vpp-perf-results-2n-dnv:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-dnv:
-      csit-vpp-perf-verify-1908-2n-dnv:
-        - 9   # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-dnv:
+        - 3   # NDRPDR sel RC2
 
     vpp-mrr-results-3n-hsw:
       # TODO: Replace
@@ -510,28 +508,20 @@
         - 65
 
     dpdk-perf-results-3n-hsw:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-3n-hsw:
-      csit-dpdk-perf-verify-1908-3n-hsw:
-        - 10  # NDRPDR sel
+      csit-dpdk-perf-verify-2001-3n-hsw:
+        - 13  # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-3n-skx:
-      csit-dpdk-perf-verify-1908-3n-skx:
-        - 12  # NDRPDR sel
+      csit-dpdk-perf-verify-2001-3n-skx:
+        - 1   # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-2n-skx:
-      csit-dpdk-perf-verify-1908-2n-skx:
-        - 12  # NDRPDR sel
+      csit-dpdk-perf-verify-2001-2n-skx:
+        - 1   # NDRPDR sel
 
     dpdk-perf-results-2n-clx:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-2n-clx:
-      csit-dpdk-perf-verify-1908-2n-skx:
-        - 12  # NDRPDR sel
+      csit-dpdk-perf-verify-2001-2n-clx:
+        - 1   # NDRPDR sel
 
 ###########################################################################
     # Tables (more than one data set)
@@ -543,32 +533,30 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 20  # NDRPDR sel
-#        - 21  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 24  # NDRPDR sel
-#        - 25  # NDRPDR sel
-#        - 26  # NDRPDR sel
-#        - 29  # NDRPDR sel
-#        - 30  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
     vpp-performance-changes-3n-hsw-ref:
       csit-vpp-perf-verify-1908-3n-hsw:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
-#        - 15  # NDRPDR sel
-#        - 16  # NDRPDR sel
-#        - 17  # NDRPDR sel
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 21  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
     vpp-performance-changes-3n-hsw-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-hsw:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-hsw:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
@@ -579,32 +567,30 @@
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 14  # NDRPDR sel
-#        - 16  # NDRPDR sel
-#        - 21  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 25  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
     vpp-performance-changes-3n-skx-ref:
       csit-vpp-perf-verify-1908-3n-skx:
         - 14  # NDRPDR sel
         - 16  # NDRPDR sel
         - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
-#        - 22  # NDRPDR sel
-#        - 23  # NDRPDR sel
-#        - 24  # NDRPDR sel
-#        - 25  # NDRPDR sel
-#        - 26  # NDRPDR sel
-#        - 29  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
     vpp-performance-changes-3n-skx-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-skx:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-skx:
+        - 2  # NDRPDR sel RC2
+        - 3  # NDRPDR sel RC2
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
@@ -615,32 +601,29 @@
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
         - 16  # NDRPDR sel
-#        - 17  # NDRPDR sel
-#        - 18  # NDRPDR sel
-#        - 21  # NDRPDR sel
-#        - 27  # NDRPDR sel
-#        - 30  # NDRPDR sel
-#        - 31  # NDRPDR sel
-#        - 32  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
     vpp-performance-changes-2n-skx-ref:
       csit-vpp-perf-verify-1908-2n-skx:
         - 26  # NDRPDR sel
         - 27  # NDRPDR sel
         - 34  # NDRPDR sel
-#        - 35  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 43  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 45  # NDRPDR sel
-#        - 46  # NDRPDR sel
+        - 35  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 45  # NDRPDR sel
+        - 46  # NDRPDR sel
     vpp-performance-changes-2n-skx-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
     vpp-performance-changes-2n-skx:
       - "vpp-performance-changes-2n-skx-h1"
       - "vpp-performance-changes-2n-skx-ref"
@@ -651,52 +634,52 @@
         - 22  # NFV
         - 31  # NFV
         - 32  # NFV
-#        - 35  # NDRPDR sel
-#        - 36  # NDRPDR sel
-#        - 42  # NDRPDR sel
-#        - 43  # NDRPDR sel
-#        - 44  # NDRPDR sel
-#        - 45  # NDRPDR sel
-#        - 46  # NDRPDR sel
     vpp-performance-changes-nfv-2n-skx-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 22  # NFV
-        - 31  # NFV
-        - 32  # NFV
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
     vpp-performance-changes-nfv-2n-skx:
       - "vpp-performance-changes-nfv-2n-skx-ref"
       - "vpp-performance-changes-nfv-2n-skx-cmp"
 
     vpp-performance-changes-2n-dnv-ref:
       csit-vpp-perf-verify-1908-2n-dnv:
-          - 1   # NDRPDR sel
-          - 2   # NDRPDR sel
-          - 3   # NDRPDR sel
+        - 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
     vpp-performance-changes-2n-dnv-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-dnv:
-      csit-vpp-perf-verify-1908-2n-dnv:
-          - 1   # NDRPDR sel
-          - 2   # NDRPDR sel
-          - 3   # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-dnv:
+        - 2   # NDRPDR sel RC2
+        - 3   # NDRPDR sel RC2
     vpp-performance-changes-2n-dnv:
       - "vpp-performance-changes-2n-dnv-ref"
       - "vpp-performance-changes-2n-dnv-cmp"
 
     vpp-performance-changes-3n-dnv-ref:
       csit-vpp-perf-verify-1908-3n-dnv:
-          - 6   # NDRPDR sel
-          - 7   # NDRPDR sel
-          - 8   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
     vpp-performance-changes-3n-dnv-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-dnv:
-      csit-vpp-perf-verify-1908-3n-dnv:
-          - 6   # NDRPDR sel
-          - 7   # NDRPDR sel
-          - 8   # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-dnv:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
     vpp-performance-changes-3n-dnv:
       - "vpp-performance-changes-3n-dnv-ref"
       - "vpp-performance-changes-3n-dnv-cmp"
@@ -706,13 +689,17 @@
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
     vpp-performance-changes-3n-tsh-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-tsh:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-tsh:
+        - 1   # NDRPDR sel RC2
     vpp-performance-changes-3n-tsh:
       - "vpp-performance-changes-3n-tsh-ref"
       - "vpp-performance-changes-3n-tsh-cmp"
@@ -841,32 +828,37 @@
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 5   # NDRPDR sel
-#        - 6   # NDRPDR sel
-#        - 13  # NDRPDR sel
-#        - 14  # NDRPDR sel
-#        - 15  # NDRPDR sel
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-#        - 20  # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
     dpdk-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-verify-1908-3n-hsw:
         - 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
+        - 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-hsw-cmp:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-3n-hsw:
-      csit-dpdk-perf-verify-1908-3n-hsw:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
+      csit-dpdk-perf-verify-2001-3n-hsw:
         - 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-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
@@ -877,32 +869,37 @@
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
-#        - 5   # NDRPDR sel
-#        - 6   # NDRPDR sel
-#        - 7   # NDRPDR sel
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
-#        - 14  # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
     dpdk-performance-changes-3n-skx-ref:
       csit-dpdk-perf-verify-1908-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
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
     dpdk-performance-changes-3n-skx-cmp:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-3n-skx:
-      csit-dpdk-perf-verify-1908-3n-skx:
+      csit-dpdk-perf-verify-2001-3n-skx:
+        - 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-performance-changes-3n-skx:
       - "dpdk-performance-changes-3n-skx-h1"
       - "dpdk-performance-changes-3n-skx-ref"
@@ -913,32 +910,37 @@
         - 2   # NDRPDR sel
         - 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
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
     dpdk-performance-changes-2n-skx-ref:
       csit-dpdk-perf-verify-1908-2n-skx:
         - 2   # NDRPDR sel
         - 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
+        - 5   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
     dpdk-performance-changes-2n-skx-cmp:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-2n-skx:
-      csit-dpdk-perf-verify-1908-2n-skx:
+      csit-dpdk-perf-verify-2001-2n-skx:
+        - 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-performance-changes-2n-skx:
       - "dpdk-performance-changes-2n-skx-h1"
       - "dpdk-performance-changes-2n-skx-ref"
@@ -948,36 +950,27 @@
 
     vpp-compare-testbeds-ref:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-hsw:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-hsw:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
     vpp-compare-testbeds-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-skx:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-skx:
+        - 2  # NDRPDR sel RC2
+        - 3  # NDRPDR sel RC2
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
 
     vpp-compare-testbeds-skx-clx-ref:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
     vpp-compare-testbeds-skx-clx-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-clx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 3   # NDRPDR sel RC2
+        - 4   # NDRPDR sel RC2
     vpp-compare-testbeds-skx-clx:
       - "vpp-compare-testbeds-skx-clx-ref"
       - "vpp-compare-testbeds-skx-clx-cmp"
@@ -1011,37 +1004,57 @@
       - "vpp-compare-testbeds-mrr-skx-clx-cmp"
 
     dpdk-compare-testbeds-ref:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-3n-hsw:
-      csit-dpdk-perf-verify-1908-3n-hsw:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
+      csit-dpdk-perf-verify-2001-3n-hsw:
         - 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-testbeds-cmp:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-3n-skx:
-      csit-dpdk-perf-verify-1908-3n-skx:
+      csit-dpdk-perf-verify-2001-3n-skx:
+        - 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:
       - "dpdk-compare-testbeds-ref"
       - "dpdk-compare-testbeds-cmp"
 
     dpdk-compare-testbeds-skx-clx-ref:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-2n-skx:
-      csit-dpdk-perf-verify-1908-2n-skx:
+      csit-dpdk-perf-verify-2001-2n-skx:
+        - 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-skx-clx-cmp:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-2n-clx:
-      csit-dpdk-perf-verify-1908-2n-skx:
+      csit-dpdk-perf-verify-2001-2n-clx:
+        - 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-skx-clx:
       - "dpdk-compare-testbeds-skx-clx-ref"
       - "dpdk-compare-testbeds-skx-clx-cmp"
@@ -1050,18 +1063,13 @@
 
     vpp-compare-topologies-ref:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-3n-skx:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
+      csit-vpp-perf-verify-2001-3n-skx:
+        - 2  # NDRPDR sel RC2
+        - 3  # NDRPDR sel RC2
     vpp-compare-topologies-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
     vpp-compare-topologies:
       - "vpp-compare-topologies-ref"
       - "vpp-compare-topologies-cmp"
@@ -1081,33 +1089,29 @@
       - "vpp-compare-topologies-mrr-cmp"
 
     dpdk-compare-topologies-ref:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-3n-skx:
-      csit-dpdk-perf-verify-1908-3n-skx:
+      csit-dpdk-perf-verify-2001-3n-skx:
+        - 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
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
     dpdk-compare-topologies-cmp:
-      # TODO: Replace
-      # csit-dpdk-perf-verify-2001-2n-skx:
-      csit-dpdk-perf-verify-1908-2n-skx:
+      csit-dpdk-perf-verify-2001-2n-skx:
+        - 1   # NDRPDR sel
         - 2   # NDRPDR sel
         - 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
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
     dpdk-compare-topologies:
       - "dpdk-compare-topologies-ref"
       - "dpdk-compare-topologies-cmp"
@@ -1630,6 +1634,63 @@
       paper_bgcolor: "white"
       plot_bgcolor: "white"
 
+    plot-hdrh-latency-by-percentile:
+      title:
+        text: "<b>Latency by Percentile Distribution</b>"
+        xanchor: "center"
+        x: 0.5
+        font:
+          size: 18
+      showlegend: True
+      legend:
+        traceorder: "normal"
+        orientation: "h"
+        font:
+          size: 16
+        xanchor: "left"
+        yanchor: "top"
+        x: 0
+        y: -0.2
+        bgcolor: "rgba(255, 255, 255, 0)"
+        bordercolor: "rgba(255, 255, 255, 0)"
+      xaxis:
+        type: "log"
+        title: "<b>Percentile [%]</b>"
+        titlefont:
+          size: 14
+        autorange: False
+        fixedrange: False
+        range: [1e-6, 3]
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(220, 220, 220)"
+        tickvals: [1, 2, 1e1, 20, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8]
+        tickangle: 315
+        ticktext: [0, 50, 90, 95, 99, 99.9, 99.99, 99.999, 99.9999, 99.99999, 99.999999]
+        tickfont:
+          size: 14
+      yaxis:
+        title: "<b>Packet Latency [uSec]</b>"
+        titlefont:
+          size: 14
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(220, 220, 220)"
+        tickfont:
+          size: 14
+      width: 700
+      height: 700
+      paper_bgcolor: "white"
+      plot_bgcolor: "white"
+
 - type: "static"
   src-path: "{DIR[RST]}"
   dst-path: "{DIR[WORKING,SRC]}"
@@ -1656,330 +1717,290 @@
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 20  # NDRPDR sel
-#      - 21  # NDRPDR sel
-#      - 23  # NDRPDR sel
-#      - 24  # NDRPDR sel
-#      - 25  # NDRPDR sel
-#      - 26  # NDRPDR sel
-#      - 29  # NDRPDR sel
-#      - 30  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 26  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
     csit-vpp-perf-verify-1908-3n-hsw:
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
-#      - 15  # NDRPDR sel
-#      - 16  # NDRPDR sel
-#      - 17  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#      - 19  # NDRPDR sel
-#      - 20  # NDRPDR sel
-#      - 21  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
+      - 21  # NDRPDR sel
       - 48  # NDRPDR sel vhost
       - 49  # NDRPDR sel vhost
       - 52  # NDRPDR sel vhost
-#      - 53  # NDRPDR sel vhost
-#      - 54  # NDRPDR sel vhost
-#      - 55  # NDRPDR sel vhost
-#      - 56  # NDRPDR sel vhost
-#      - 57  # NDRPDR sel vhost
-#      - 58  # NDRPDR sel vhost
-#      - 59  # NDRPDR sel vhost
-      - 24  # NDRPDR full
-      - 25  # NDRPDR full
-      - 26  # NDRPDR full
-#      - 27  # NDRPDR full
-#      - 28  # NDRPDR full
-#      - 29  # NDRPDR full
-#      - 32  # NDRPDR full
-#      - 33  # NDRPDR full
-#      - 36  # NDRPDR full
-#      - 38  # NDRPDR full
-#      - 50  # NDRPDR full vhost
+      - 53  # NDRPDR sel vhost
+      - 54  # NDRPDR sel vhost
+      - 55  # NDRPDR sel vhost
+      - 56  # NDRPDR sel vhost
+      - 57  # NDRPDR sel vhost
+      - 58  # NDRPDR sel vhost
+      - 59  # NDRPDR sel vhost
       - 39  # MRR sel
-#    csit-vpp-perf-verify-2001-3n-hsw:
-
-    # TODO: Remove
-    # This data is only an example for HDRHistogram
-    csit-vpp-perf-verify-master-3n-hsw:
-      - 595
+    csit-vpp-perf-verify-2001-3n-hsw:
+      - 3   # NDRPDR sel RC2
+      - 4   # NDRPDR sel RC2
 
     csit-vpp-perf-verify-1904-3n-skx:
       - 7   # MRR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
-#      - 11  # NDRPDR sel
-#      - 12  # NDRPDR sel
-#      - 14  # NDRPDR sel
-#      - 16  # NDRPDR sel
-#      - 21  # NDRPDR sel
-#      - 23  # NDRPDR sel
-#      - 25  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
     csit-vpp-perf-verify-1908-3n-skx:
       - 14  # NDRPDR sel
       - 16  # NDRPDR sel
       - 19  # NDRPDR sel
-#      - 20  # NDRPDR sel
-#      - 22  # NDRPDR sel
-#      - 23  # NDRPDR sel
-#      - 24  # NDRPDR sel
-#      - 25  # NDRPDR sel
-#      - 26  # NDRPDR sel
-#      - 29  # NDRPDR sel
-#      - 52  # NDRPDR sel vhost
-#      - 53  # NDRPDR sel vhost
-#      - 55  # NDRPDR sel vhost
-#      - 61  # NDRPDR sel vhost
-#      - 62  # NDRPDR sel vhost
-#      - 63  # NDRPDR sel vhost
-#      - 64  # NDRPDR sel vhost
-#      - 65  # NDRPDR sel vhost
-#      - 66  # NDRPDR sel vhost
-#      - 67  # NDRPDR sel vhost
-      - 27  # NDRPDR full
-      - 28  # NDRPDR full
-      - 30  # NDRPDR full
-#      - 31  # NDRPDR full
-#      - 32  # NDRPDR full
-#      - 33  # NDRPDR full
-#      - 34  # NDRPDR full
-#      - 35  # NDRPDR full
-#      - 37  # NDRPDR full
-#      - 39  # NDRPDR full
-#      - 40  # NDRPDR full
-#      - 41  # NDRPDR full
-#      - 54  # NDRPDR full
+      - 20  # NDRPDR sel
+      - 22  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 24  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 26  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 52  # NDRPDR sel vhost
+      - 53  # NDRPDR sel vhost
+      - 55  # NDRPDR sel vhost
+      - 61  # NDRPDR sel vhost
+      - 62  # NDRPDR sel vhost
+      - 63  # NDRPDR sel vhost
+      - 64  # NDRPDR sel vhost
+      - 65  # NDRPDR sel vhost
+      - 66  # NDRPDR sel vhost
+      - 67  # NDRPDR sel vhost
       - 36  # MRR sel
     csit-vpp-perf-verify-2001-3n-skx:
-
-    # TODO: Remove
-    # This data is only an example for HDRHistogram
-    csit-vpp-perf-verify-master-3n-skx:
-      - 299
+      - 2  # NDRPDR sel RC2
+      - 3  # NDRPDR sel RC2
 
     csit-vpp-perf-verify-1904-2n-skx:
       - 11  # MRR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 16  # NDRPDR sel
-#      - 17  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#      - 21  # NDRPDR sel
-#      - 27  # NDRPDR sel
-#      - 30  # NDRPDR sel
-#      - 31  # NDRPDR sel
-#      - 32  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 21  # NDRPDR sel
+      - 27  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 32  # NDRPDR sel
     csit-vpp-perf-verify-1908-2n-skx:
       - 26  # NDRPDR sel
       - 27  # NDRPDR sel
       - 34  # NDRPDR sel
-#      - 35  # NDRPDR sel
-#      - 36  # NDRPDR sel
-#      - 42  # NDRPDR sel
-#      - 43  # NDRPDR sel
-#      - 44  # NDRPDR sel
-#      - 45  # NDRPDR sel
-#      - 46  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 45  # NDRPDR sel
+      - 46  # NDRPDR sel
       - 88  # NDRPDR sel vhost
       - 89  # NDRPDR sel vhost
       - 91  # NDRPDR sel vhost
-#      - 92  # NDRPDR sel vhost
-#      - 93  # NDRPDR sel vhost
-#      - 94  # NDRPDR sel vhost
-#      - 95  # NDRPDR sel vhost
-#      - 96  # NDRPDR sel vhost
-#      - 97  # NDRPDR sel vhost
-#      - 98  # NDRPDR sel vhost
-      - 48  # NDRPDR full
-      - 49  # NDRPDR full
-      - 50  # NDRPDR full
-#      - 51  # NDRPDR full
-#      - 54  # NDRPDR full
-#      - 55  # NDRPDR full
-#      - 90  # NDRPDR full vhost
+      - 92  # NDRPDR sel vhost
+      - 93  # NDRPDR sel vhost
+      - 94  # NDRPDR sel vhost
+      - 95  # NDRPDR sel vhost
+      - 96  # NDRPDR sel vhost
+      - 97  # NDRPDR sel vhost
+      - 98  # NDRPDR sel vhost
       - 69  # MRR sel
       - 29  # TCP
       - 30  # TCP
       - 58  # TCP
-#      - 59  # TCP
-#      - 60  # TCP
-#      - 61  # TCP
-#      - 62  # TCP
-#      - 63  # TCP
-#      - 64  # TCP
-#      - 65  # TCP
       - 22  # NFV
       - 31  # NFV
       - 32  # NFV
-#      - 37  # NFV
-#      - 38  # NFV
-#      - 39  # NFV
-#      - 53  # NFV
-#      - 67  # NFV
-#      - 68  # NFV
-#      - 70  # NFV
-#      - 110 # NFV full
-#      - 111 # NFV full
-#      - 126 # NFV full
-#      - 127 # NFV full
       - 71  # NFV MRR
-#      - 112 # NFV reconf full
       - 113 # NFV reconf sel
       - 114 # NFV reconf sel
       - 115 # NFV reconf sel
-#      - 116 # NFV reconf sel
-#      - 118 # NFV reconf sel
-#      - 119 # NFV reconf sel
-#      - 120 # NFV reconf sel
-#      - 121 # NFV reconf sel
-#      - 122 # NFV reconf sel
-#      - 123 # NFV reconf sel
       - 83  # SOAK
       - 86  # SOAK
-#    csit-vpp-perf-verify-2001-2n-skx:
+    csit-vpp-perf-verify-2001-2n-skx:
+      - 3  # NDRPDR sel RC2
 
-    # TODO: Remove
-    # This data is only an example for HDRHistogram
-    csit-vpp-perf-verify-master-2n-skx:
-      - 930
-
-    # csit-vpp-perf-verify-2001-2n-clx:
+    csit-vpp-perf-verify-2001-2n-clx:
+      - 3   # NDRPDR sel RC2
+      - 4   # NDRPDR sel RC2
 
     csit-vpp-perf-verify-1908-3n-tsh:
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
-#      - 10  # NDRPDR sel
-#      - 11  # NDRPDR sel
-#      - 12  # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
       - 13  # NDRPDR sel
-#      - 14  # NDRPDR sel
-#      - 15  # NDRPDR sel
-#      - 16  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
       - 17  # MRR sel
-#    csit-vpp-perf-verify-2001-3n-tsh:
-
-    # TODO: Remove
-    # This data is only an example for HDRHistogram
-    csit-vpp-perf-verify-master-3n-tsh:
-      - 25
+    csit-vpp-perf-verify-2001-3n-tsh:
+      - 1   # NDRPDR sel RC2
 
     csit-vpp-perf-verify-1908-3n-dnv:
       - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
-#      - 9   # NDRPDR sel
-#      - 10  # NDRPDR sel
-#      - 12  # NDRPDR sel
-#      - 13  # NDRPDR sel
-#      - 14  # NDRPDR sel
-#      - 15  # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
       - 16  # NDRPDR sel
       - 17  # MRR sel
-#    csit-vpp-perf-verify-1908-3n-dnv:
+    csit-vpp-perf-verify-2001-3n-dnv:
+      - 3   # NDRPDR sel RC2
+      - 4   # NDRPDR sel RC2
 
     csit-vpp-perf-verify-1908-2n-dnv:
       - 1   # NDRPDR sel
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
-#      - 4   # NDRPDR sel
-#      - 5   # NDRPDR sel
-#      - 6   # NDRPDR sel
-#      - 7   # NDRPDR sel
-#      - 8   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
       - 9   # NDRPDR sel
-#      - 10  # NDRPDR sel
+      - 10  # NDRPDR sel
       - 11  # MRR sel
-#    csit-vpp-perf-verify-1908-2n-dnv:
+    csit-vpp-perf-verify-2001-2n-dnv:
+      - 2   # NDRPDR sel RC2
+      - 3   # NDRPDR sel RC2
 
     csit-dpdk-perf-verify-1904-3n-hsw:
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
       - 5   # NDRPDR sel
-#      - 6   # NDRPDR sel
-#      - 13  # NDRPDR sel
-#      - 14  # NDRPDR sel
-#      - 15  # NDRPDR sel
-#      - 18  # NDRPDR sel
-#      - 19  # NDRPDR sel
-#      - 20  # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 20  # NDRPDR sel
     csit-dpdk-perf-verify-1908-3n-hsw:
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-#      - 5   # NDRPDR sel
-#      - 6   # NDRPDR sel
-#      - 7   # NDRPDR sel
-#      - 8   # NDRPDR sel
-#      - 9   # 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-2001-3n-hsw:
+      - 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-2001-3n-hsw:
-
-    # TODO: Replace
-    # This data is only an example for HDRHistogram
-    csit-dpdk-perf-verify-master-3n-hsw:
-      - 13
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
 
     csit-dpdk-perf-verify-1904-3n-skx:
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
-#      - 5   # NDRPDR sel
-#      - 6   # NDRPDR sel
-#      - 7   # NDRPDR sel
-#      - 11  # NDRPDR sel
-#      - 12  # NDRPDR sel
-#      - 13  # NDRPDR sel
-#      - 14  # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
     csit-dpdk-perf-verify-1908-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
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
       - 12  # NDRPDR sel
-#    csit-dpdk-perf-verify-2001-3n-skx:
-
-    # TODO: Replace
-    # This data is only an example for HDRHistogram
-    csit-dpdk-perf-verify-master-3n-skx:
-      - 23
+    csit-dpdk-perf-verify-2001-3n-skx:
+      - 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-1904-2n-skx:
       - 2   # NDRPDR sel
       - 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
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
     csit-dpdk-perf-verify-1908-2n-skx:
       - 2   # NDRPDR sel
       - 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
-#    csit-dpdk-perf-verify-1908-2n-skx:
-
-    # TODO: Replace
-    # This data is only an example for HDRHistogram
-    csit-dpdk-perf-verify-master-2n-skx:
-      - 16
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+    csit-dpdk-perf-verify-2001-2n-skx:
+      - 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-2001-2n-clx:
+    csit-dpdk-perf-verify-2001-2n-clx:
+      - 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
 
     # TODO: Replace
     # csit-vpp-device-2001-ubuntu1804-1n-skx:
@@ -2012,7 +2033,7 @@
     data: "vpp-soak-vs-ndr-2n-skx-cmp"
   data: "vpp-soak-vs-ndr-2n-skx"
   include-tests: "NDR"
-  filter: "('NDRPDR' or 'SOAK')"
+  filter: "('NDRPDR' or 'SOAK') and not 'NF_DENSITY'"
   parameters:
     - "throughput"
     - "name"
@@ -2033,7 +2054,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2053,7 +2074,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2073,7 +2094,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2093,7 +2114,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2113,7 +2134,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2133,7 +2154,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2153,7 +2174,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2173,7 +2194,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2193,7 +2214,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2213,7 +2234,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2233,7 +2254,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2253,7 +2274,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2273,7 +2294,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2293,7 +2314,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2320,7 +2341,7 @@
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR'"
+  filter: "'1T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2343,7 +2364,7 @@
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR'"
+  filter: "'2T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2366,7 +2387,7 @@
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR'"
+  filter: "'1T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2389,7 +2410,7 @@
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR'"
+  filter: "'2T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2405,17 +2426,17 @@
       data: "vpp-performance-changes-3n-skx-h1"
       nic: "NIC_Intel-X710"
   reference:
-    title: "rls1908 x710"
+    title: "rls1908 xxv710"
     data: "vpp-performance-changes-3n-skx-ref"
     data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-    nic: "NIC_Intel-X710"
+    nic: "NIC_Intel-XXV710"
   compare:
     title: "rls2001 xxv710"
     data: "vpp-performance-changes-3n-skx-cmp"
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2442,7 +2463,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2469,7 +2490,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2496,7 +2517,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2513,17 +2534,17 @@
       data: "vpp-performance-changes-2n-skx-h1"
       nic: "NIC_Intel-X710"
   reference:
-    title: "rls1908 x710"
+    title: "rls1908 xxv710"
     data: "vpp-performance-changes-2n-skx-ref"
     data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    nic: "NIC_Intel-X710"
+    nic: "NIC_Intel-XXV710"
   compare:
     title: "rls2001 xxv710"
     data: "vpp-performance-changes-2n-skx-cmp"
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2540,17 +2561,17 @@
       data: "vpp-performance-changes-2n-skx-h1"
       nic: "NIC_Intel-X710"
   reference:
-    title: "rls1908 x710"
+    title: "rls1908 xxv710"
     data: "vpp-performance-changes-2n-skx-ref"
     data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    nic: "NIC_Intel-X710"
+    nic: "NIC_Intel-XXV710"
   compare:
     title: "rls2001 xxv710"
     data: "vpp-performance-changes-2n-skx-cmp"
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2567,17 +2588,17 @@
       data: "vpp-performance-changes-2n-skx-h1"
       nic: "NIC_Intel-X710"
   reference:
-    title: "rls1908 x710"
+    title: "rls1908 xxv710"
     data: "vpp-performance-changes-2n-skx-ref"
     data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    nic: "NIC_Intel-X710"
+    nic: "NIC_Intel-XXV710"
   compare:
     title: "rls2001 xxv710"
     data: "vpp-performance-changes-2n-skx-cmp"
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2594,17 +2615,17 @@
       data: "vpp-performance-changes-2n-skx-h1"
       nic: "NIC_Intel-X710"
   reference:
-    title: "rls1908 x710"
+    title: "rls1908 xxv710"
     data: "vpp-performance-changes-2n-skx-ref"
     data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    nic: "NIC_Intel-X710"
+    nic: "NIC_Intel-XXV710"
   compare:
     title: "rls2001 xxv710"
     data: "vpp-performance-changes-2n-skx-cmp"
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2624,7 +2645,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-cmp"
   data: "vpp-performance-changes-nfv-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2644,7 +2665,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-cmp"
   data: "vpp-performance-changes-nfv-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2664,7 +2685,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-cmp"
   data: "vpp-performance-changes-nfv-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2684,7 +2705,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-cmp"
   data: "vpp-performance-changes-nfv-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3191,7 +3212,7 @@
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'MRR'"
+  filter: "'1T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3213,7 +3234,7 @@
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'MRR'"
+  filter: "'2T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3235,7 +3256,7 @@
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T4C' and 'MRR'"
+  filter: "'4T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3257,7 +3278,7 @@
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3279,7 +3300,7 @@
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3301,7 +3322,7 @@
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3323,7 +3344,7 @@
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3345,7 +3366,7 @@
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3367,7 +3388,7 @@
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3386,7 +3407,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-nfv-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3405,7 +3426,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-nfv-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3424,7 +3445,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-nfv-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -6288,8 +6309,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '2T1C' and
            'MRR'"
   parameters:
@@ -6315,8 +6335,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '4T2C' and
            'MRR'"
   parameters:
@@ -6342,8 +6361,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '8T4C' and
            'MRR'"
   parameters:
@@ -6370,7 +6388,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"
@@ -6397,7 +6414,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"
@@ -6424,7 +6440,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'MRR'"
@@ -6452,8 +6467,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '2T1C' and
            'NDRPDR'"
   parameters:
@@ -6479,8 +6493,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '4T2C' and
            'NDRPDR'"
   parameters:
@@ -6506,8 +6519,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '8T4C' and
            'NDRPDR'"
   parameters:
@@ -6533,8 +6545,7 @@
            'NF_DENSITY' and
            'VHOST' and
            'VXLAN' and
-           'CHAIN' and
-           'NF_VPPIP4' and
+           'CHAIN' a
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
@@ -6561,7 +6572,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
@@ -6588,7 +6598,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
@@ -6616,8 +6625,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '2T1C' and
            'NDRPDR'"
   parameters:
@@ -6643,8 +6651,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '4T2C' and
            'NDRPDR'"
   parameters:
@@ -6670,8 +6677,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '8T4C' and
            'NDRPDR'"
   parameters:
@@ -6698,7 +6704,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
@@ -6725,7 +6730,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
@@ -6752,7 +6756,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
@@ -7244,19 +7247,20 @@
     layout: "plot-service-density"
 
 ###############################################################################
-# Plots - NF Density - CSP - MRR 64b
+
+# Plots - NF Density - CSC - MRR IMIX
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-csc-mrr"
+  data: "plot-vpp-nfv-3n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
-           '64B' and
+           'IMIX' and
            '2T1C' and
            'MRR'"
   parameters:
@@ -7264,25 +7268,26 @@
   - "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]"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-csc-mrr"
+  data: "plot-vpp-nfv-3n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
-           '64B' and
+           'IPSEC' and
+           'IMIX' and
            '4T2C' and
            'MRR'"
   parameters:
@@ -7290,25 +7295,26 @@
   - "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]"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-csc-mrr"
+  data: "plot-vpp-nfv-3n-skx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
-           '64B' and
+           'IPSEC' and
+           'IMIX' and
            '8T4C' and
            'MRR'"
   parameters:
@@ -7316,178 +7322,1628 @@
   - "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]"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
-# Plots - NF Density - CSP - MRR IMIX
+# Plots - NF Density - CSC - NDR IMIX
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-csc-ndr"
+  data: "plot-vpp-nfv-3n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
+           'IPSEC' and
            'IMIX' 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: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-csc-ndr"
+  data: "plot-vpp-nfv-3n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
+           'IPSEC' and
            'IMIX' 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: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-csc-ndr"
+  data: "plot-vpp-nfv-3n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
+           'IPSEC' and
            'IMIX' and
            '8T4C' 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: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
-# Plots - NF Density - CSP - NDR 64b
+# Plots - NF Density - CSC - PDR IMIX
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-csc-pdr"
+  data: "plot-vpp-nfv-3n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
-           '64B' and
+           'IPSEC' 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: "64B Packet Throughput (mean NDR) [Mpps]"
+  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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-csc-pdr"
+  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-csc-pdr"
+  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '8T4C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+###############################################################################
+
+# Plots - NF Density - CSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-csc-mrr"
+  data: "plot-vpp-nfv-3n-hsw-mrr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '1T1C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-csc-mrr"
+  data: "plot-vpp-nfv-3n-hsw-mrr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '2T2C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-csc-mrr"
+  data: "plot-vpp-nfv-3n-hsw-mrr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '4T4C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-csc-ndr"
+  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '1T1C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-csc-ndr"
+  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '2T2C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-csc-ndr"
+  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '4T4C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-csc-pdr"
+  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '1T1C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-csc-pdr"
+  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '2T2C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-csc-pdr"
+  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+  filter: "'NIC_Intel-XL710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IPSEC' and
+           'IMIX' and
+           '4T4C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+###############################################################################
+# Plots - NF Density - CSP - MRR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - NDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - PDR 64b
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+###############################################################################
+# Plots - 2n-clx NF Density - VSC - MRR IMIX
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' 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-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' a
+           '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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' 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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '8T4C' 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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-vsc-vxlan-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' 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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-vsc-vxlan-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' 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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-vsc-vxlan-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '8T4C' 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-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' 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-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' 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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
-           '64B' 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: "64B Packet Throughput (mean NDR) [Mpps]"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
-           'PIPELINE' and
+           'CHAIN' and
            'NF_VPPIP4' and
-           '64B' and
+           'IMIX' and
            '8T4C' 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]"
+  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-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
-# Plots - NF Density - CSP - NDR IMIX
+# Plots - NF Density - CSP - MRR IMIX
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
@@ -7495,25 +8951,25 @@
            'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
-           'NDRPDR'"
+           'MRR'"
   parameters:
-  - "throughput"
+  - "result"
   - "name"
   - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  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 NDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
@@ -7521,25 +8977,25 @@
            'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
-           'NDRPDR'"
+           'MRR'"
   parameters:
-  - "throughput"
+  - "result"
   - "name"
   - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  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 NDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-clx-mrr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
@@ -7547,96 +9003,96 @@
            'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
-           'NDRPDR'"
+           'MRR'"
   parameters:
-  - "throughput"
+  - "result"
   - "name"
   - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  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 NDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
-# Plots - NF Density - CSP - PDR 64b
+# Plots - NF Density - CSP - NDR IMIX
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
            'NF_VPPIP4' and
-           '64B' and
+           'IMIX' and
            '2T1C' and
            'NDRPDR'"
   parameters:
   - "throughput"
   - "name"
   - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  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 PDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
            'NF_VPPIP4' and
-           '64B' and
+           'IMIX' and
            '4T2C' and
            'NDRPDR'"
   parameters:
   - "throughput"
   - "name"
   - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  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 PDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
            'NF_VPPIP4' and
-           '64B' and
+           'IMIX' and
            '8T4C' and
            'NDRPDR'"
   parameters:
   - "throughput"
   - "name"
   - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  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 PDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 # Plots - NF Density - CSP - PDR IMIX
@@ -7644,8 +9100,8 @@
   title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
@@ -7670,8 +9126,8 @@
   title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
@@ -7696,8 +9152,8 @@
   title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-clx-xxv710-imix-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-clx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
@@ -19396,6 +20852,56 @@
     title: "2n-clx-x710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
+# 2n-clx-cx556a
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-clx-cx556a-64b-2t1c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-2t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-cx556a-64b-2t1c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-clx-cx556a-64b-4t2c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-4t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-cx556a-64b-4t2c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-clx-cx556a-64b-2t1c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-2t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-cx556a-64b-2t1c-base-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-clx-cx556a-64b-4t2c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-4t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-cx556a-64b-4t2c-base-pdr"
+    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Latency - DPDK
@@ -19476,6 +20982,44 @@
     title: "2n-clx-x710-64b-8t4c-base-ndr"
     layout: "plot-latency"
 
+# 2n-clx-cx556a
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_lat_err_bars_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-cx556a-64b-2t1c-base-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_lat_err_bars_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-cx556a-64b-4t2c-base-ndr"
+    layout: "plot-latency"
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-8t4c-base-ndr-lat"
+  algorithm: "plot_lat_err_bars_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-8t4c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-8t4c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-8t4c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-clx-cx556a-64b-8t4c-base-ndr"
+    layout: "plot-latency"
+
 ################################################################################
 
 # HDRHistogram Packet Latency - DPDK
@@ -19556,6 +21100,44 @@
   layout:
     layout: "plot-hdrh-latency"
 
+# 2n-clx-cx556a
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-2t1c-base-ndr-hdrh-lat"
+  graph-title: "2n-clx-cx556a-64b-2t1c-base-ndr"
+  algorithm: "plot_lat_hdrh_bar_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-2t1c-base-ndr-hdrh-lat"
+  data: "plot-dpdk-hdrh-lat-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    layout: "plot-hdrh-latency"
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-4t2c-base-ndr-hdrh-lat"
+  graph-title: "2n-clx-cx556a-64b-4t2c-base-ndr"
+  algorithm: "plot_lat_hdrh_bar_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-4t2c-base-ndr-hdrh-lat"
+  data: "plot-dpdk-hdrh-lat-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    layout: "plot-hdrh-latency"
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-8t4c-base-ndr-hdrh-lat"
+  graph-title: "2n-clx-cx556a-64b-8t4c-base-ndr"
+  algorithm: "plot_lat_hdrh_bar_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-8t4c-base-ndr-hdrh-lat"
+  data: "plot-dpdk-hdrh-lat-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-8t4c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-8t4c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    layout: "plot-hdrh-latency"
+
 ################################################################################
 
 # HDRHistogram Packet Latency Percentile 1C
@@ -22698,3 +24280,77 @@
     - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-8t4c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
     layout: "plot-hdrh-latency-percentile"
+
+# 2n-clx-cx556a
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-2t1c-base-ndr-hdrh-lat-percentile"
+  graph-title: "2n-clx-cx556a-64b-2t1c-base-ndr"
+  algorithm: "plot_lat_hdrh_percentile"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-2t1c-base-ndr-hdrh-lat-percentile"
+  data: "plot-dpdk-hdrh-lat-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-2t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-2t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    layout: "plot-hdrh-latency-percentile"
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-4t2c-base-ndr-hdrh-lat-percentile"
+  graph-title: "2n-clx-cx556a-64b-4t2c-base-ndr"
+  algorithm: "plot_lat_hdrh_percentile"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-4t2c-base-ndr-hdrh-lat-percentile"
+  data: "plot-dpdk-hdrh-lat-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-4t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-4t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    layout: "plot-hdrh-latency-percentile"
+
+- type: "plot"
+  title: "Latency: 2n-clx-cx556a-64b-8t4c-base-ndr-hdrh-lat-percentile"
+  graph-title: "2n-clx-cx556a-64b-8t4c-base-ndr"
+  algorithm: "plot_lat_hdrh_percentile"
+  output-file: "{DIR[STATIC,DPDK]}/2n-clx-cx556a-64b-8t4c-base-ndr-hdrh-lat-percentile"
+  data: "plot-dpdk-hdrh-lat-2n-clx"
+  include:
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-eth-l2xcbase-testpmd-ndrpdr.64b-8t4c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-100ge2p1cx556a-ethip4-ip4base-l3fwd-ndrpdr.64b-8t4c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    layout: "plot-hdrh-latency-percentile"
+
+################################################################################
+
+- type: "plot"
+  title: "Latency by percentile: 2n-skx-xxv710"
+  algorithm: "plot_hdrh_lat_by_percentile"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-hdrh-lat-percentile"
+  data: "plot-vpp-hdrh-lat-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Ndrpdr.64B-2t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
+  layout:
+    layout: "plot-hdrh-latency-by-percentile"
Integration tests