Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Report: Remove Ligato
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 1b65748..d4d927a 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -133,7 +133,14 @@
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
-        - 12   # 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
 
     plot-vpp-http-server-performance:
       # TODO: Replace with 1904 data
 
     plot-vpp-http-server-performance:
       # TODO: Replace with 1904 data
@@ -150,33 +157,37 @@
         - 36  # WRK
         - 37  # WRK
 
         - 36  # WRK
         - 37  # WRK
 
-    plot-ligato-throughput-lat-tsa-3n-hsw:
-      # TODO: Replace with 1904 data
-      # csit-ligato-perf-verify-1904-3n-hsw:
-      csit-ligato-perf-verify-1901-3n-hsw:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
+#    plot-ligato-throughput-lat-tsa-3n-hsw:
+#      # TODO: Replace with 1904 data
+#      # csit-ligato-perf-verify-1904-3n-hsw:
+#      csit-ligato-perf-verify-1901-3n-hsw:
+#        - 8   # NDRPDR sel
+#        - 9   # NDRPDR sel
+#        - 11  # NDRPDR sel
+#        - 12  # NDRPDR sel
+#        - 13  # NDRPDR sel
+#        - 14  # NDRPDR sel
+#        - 15  # NDRPDR sel
+#        - 16  # NDRPDR sel
+#        - 17  # NDRPDR sel
+#        - 18  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-hsw:
 
     plot-dpdk-throughput-latency-3n-hsw:
-      # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-hsw:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
       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
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
@@ -184,9 +195,12 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
 
     plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
@@ -194,11 +208,14 @@
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -209,6 +226,7 @@
         - 27  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 27  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
       # TODO: Replace with 1904 data
 
     plot-vpp-soak-2n-skx:
       # TODO: Replace with 1904 data
@@ -216,15 +234,34 @@
       csit-vpp-perf-verify-1901-2n-skx:
         - 45  # SOAK sel
 
       csit-vpp-perf-verify-1901-2n-skx:
         - 45  # SOAK sel
 
-    plot-vpp-nfv-2n-skx:
+    plot-vpp-nfv-2n-skx-ndrpdr-64b:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 9   # NFV NDRPDR
+        - 56  # NFV NDRPDR 64b
+        - 59  # NFV NDRPDR 64b
+        - 60  # NFV NDRPDR 64b
 
 
-    plot-vpp-nfv-2n-skx-mrr:
+    plot-vpp-nfv-2n-skx-ndrpdr-imix:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 10  # NFV MRR
+        - 61  # NFV NDRPDR IMIX
+        - 63  # NFV NDRPDR IMIX
+
+    plot-vpp-nfv-2n-skx-mrr-64b:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 40  # NFV MRR 64b
+        - 41  # NFV MRR 64b
+        - 42  # NFV MRR 64b
+        - 47  # NFV MRR 64b
+        - 48  # NFV MRR 64b
+
+    plot-vpp-nfv-2n-skx-mrr-imix:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 49  # NFV MRR IMIX
+        - 50  # NFV MRR IMIX
+        - 51  # NFV MRR IMIX
+        - 54  # NFV MRR IMIX
+        - 55  # NFV MRR IMIX
 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1904-2n-skx:
 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1904-2n-skx:
@@ -257,10 +294,16 @@
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
-        - 12   # 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
 
     vpp-nic-comparison-3n-skx:
 
     vpp-nic-comparison-3n-skx:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
@@ -268,9 +311,12 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
 
     vpp-nic-comparison-2n-skx:
 
     vpp-nic-comparison-2n-skx:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -281,10 +327,11 @@
         - 27  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 27  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
 
     vpp-nic-comparison-3n-hsw-mrr:
       csit-vpp-perf-verify-1904-3n-hsw:
 
     vpp-nic-comparison-3n-hsw-mrr:
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 1   # MRR sel
+        - 9   # MRR sel
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1904-3n-skx:
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1904-3n-skx:
@@ -302,18 +349,21 @@
         - 12  # NDRPDR sel
 
     vpp-perf-results-3n-skx:
         - 12  # NDRPDR sel
 
     vpp-perf-results-3n-skx:
-      # TODO: Replace with FULL 1904 data
+      # TODO: Add FULL 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
-        - 10  # NDRPDR sel
+        - 26  # NDRPDR full
+        - 27  # NDRPDR full
 
     vpp-perf-results-2n-skx:
 
     vpp-perf-results-2n-skx:
-      # TODO: Replace with FULL 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
       csit-vpp-perf-verify-1904-2n-skx:
-        - 21
+        - 33  # NDRPDR full
+        - 39  # NDRPDR full
+        - 58  # NDRPDR full
+        - 62  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1904-3n-hsw:
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 1   # MRR sel
+        - 9   # MRR sel
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
@@ -335,12 +385,12 @@
       csit-vpp-device-1904-ubuntu1804-1n-skx:
         - 33
 
       csit-vpp-device-1904-ubuntu1804-1n-skx:
         - 33
 
-    # VPP Ligato
-    ligato-perf-results-3n-hsw:
-      # TODO: Replace with 1904 data
-      # csit-ligato-perf-verify-1904-3n-hsw:
-      csit-ligato-perf-verify-1901-3n-hsw:
-        - 10  # NDRPDR full
+#    # VPP Ligato
+#    ligato-perf-results-3n-hsw:
+#      # TODO: Replace with 1904 data
+#      # csit-ligato-perf-verify-1904-3n-hsw:
+#      csit-ligato-perf-verify-1901-3n-hsw:
+#        - 10  # NDRPDR full
 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1904-3n-hsw:
 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-verify-1904-3n-hsw:
@@ -357,7 +407,7 @@
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1904-ubuntu1604:
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1904-ubuntu1604:
-        - 1
+        - 4
 
 #    # NSH SFC Functional
 #    nsh-func-results:
 
 #    # NSH SFC Functional
 #    nsh-func-results:
@@ -429,7 +479,14 @@
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
-        - 12   # 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
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
@@ -470,7 +527,6 @@
         - 66  # NDRPDR LB
         - 67  # NDRPDR LB
     vpp-performance-changes-3n-skx-cmp:
         - 66  # NDRPDR LB
         - 67  # NDRPDR LB
     vpp-performance-changes-3n-skx-cmp:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
@@ -478,6 +534,10 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # 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:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
     vpp-performance-changes-3n-skx:
       - "vpp-performance-changes-3n-skx-h1"
       - "vpp-performance-changes-3n-skx-ref"
@@ -508,7 +568,6 @@
         - 42  # NDRPDR sel
         - 43  # NDRPDR sel
     vpp-performance-changes-2n-skx-cmp:
         - 42  # NDRPDR sel
         - 43  # NDRPDR sel
     vpp-performance-changes-2n-skx-cmp:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -519,6 +578,7 @@
         - 27  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 27  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
     vpp-performance-changes-2n-skx:
       - "vpp-performance-changes-2n-skx-h1"
       - "vpp-performance-changes-2n-skx-ref"
     vpp-performance-changes-2n-skx:
       - "vpp-performance-changes-2n-skx-h1"
       - "vpp-performance-changes-2n-skx-ref"
@@ -532,7 +592,7 @@
         - 35  # MRR sel
     vpp-performance-changes-3n-hsw-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-hsw:
         - 35  # MRR sel
     vpp-performance-changes-3n-hsw-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 1   # MRR sel
+        - 9   # MRR sel
     vpp-performance-changes-3n-hsw-mrr:
       - "vpp-performance-changes-3n-hsw-mrr-h1"
       - "vpp-performance-changes-3n-hsw-mrr-ref"
     vpp-performance-changes-3n-hsw-mrr:
       - "vpp-performance-changes-3n-hsw-mrr-h1"
       - "vpp-performance-changes-3n-hsw-mrr-ref"
@@ -597,12 +657,17 @@
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
     dpdk-performance-changes-3n-hsw-cmp:
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
     dpdk-performance-changes-3n-hsw-cmp:
-      # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-hsw:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
       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
     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
     dpdk-performance-changes-3n-hsw:
       - "dpdk-performance-changes-3n-hsw-h1"
       - "dpdk-performance-changes-3n-hsw-ref"
@@ -633,7 +698,6 @@
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
     dpdk-performance-changes-3n-skx-cmp:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
     dpdk-performance-changes-3n-skx-cmp:
-      # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
@@ -641,6 +705,10 @@
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # 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:
       - "dpdk-performance-changes-3n-skx-h1"
       - "dpdk-performance-changes-3n-skx-ref"
     dpdk-performance-changes-3n-skx:
       - "dpdk-performance-changes-3n-skx-h1"
       - "dpdk-performance-changes-3n-skx-ref"
@@ -693,9 +761,15 @@
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
-        - 12   # 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
     vpp-compare-testbeds-cmp:
     vpp-compare-testbeds-cmp:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
@@ -703,13 +777,17 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
 
     vpp-compare-testbeds-mrr-ref:
       csit-vpp-perf-verify-1904-3n-hsw:
     vpp-compare-testbeds:
       - "vpp-compare-testbeds-ref"
       - "vpp-compare-testbeds-cmp"
 
     vpp-compare-testbeds-mrr-ref:
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 1   # MRR sel
+        - 9   # MRR sel
     vpp-compare-testbeds-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
         - 7   # MRR sel
     vpp-compare-testbeds-mrr-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
         - 7   # MRR sel
@@ -718,14 +796,18 @@
       - "vpp-compare-testbeds-mrr-cmp"
 
     dpdk-compare-testbeds-ref:
       - "vpp-compare-testbeds-mrr-cmp"
 
     dpdk-compare-testbeds-ref:
-      # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-hsw:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
       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
     dpdk-compare-testbeds-cmp:
     dpdk-compare-testbeds-cmp:
-      # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
@@ -733,6 +815,10 @@
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
     dpdk-compare-testbeds:
       - "dpdk-compare-testbeds-ref"
       - "dpdk-compare-testbeds-cmp"
     dpdk-compare-testbeds:
       - "dpdk-compare-testbeds-ref"
       - "dpdk-compare-testbeds-cmp"
@@ -740,7 +826,6 @@
     # Compare topologies
 
     vpp-compare-topologies-ref:
     # Compare topologies
 
     vpp-compare-topologies-ref:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
@@ -748,8 +833,11 @@
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
     vpp-compare-topologies-cmp:
     vpp-compare-topologies-cmp:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
       csit-vpp-perf-verify-1904-2n-skx:
         - 12  # NDRPDR sel
         - 14  # NDRPDR sel
@@ -760,6 +848,7 @@
         - 27  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 27  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
     vpp-compare-topologies:
       - "vpp-compare-topologies-ref"
       - "vpp-compare-topologies-cmp"
     vpp-compare-topologies:
       - "vpp-compare-topologies-ref"
       - "vpp-compare-topologies-cmp"
@@ -775,7 +864,6 @@
       - "vpp-compare-topologies-mrr-cmp"
 
     dpdk-compare-topologies-ref:
       - "vpp-compare-topologies-mrr-cmp"
 
     dpdk-compare-topologies-ref:
-      # TODO: Add 1904 data
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
       csit-dpdk-perf-verify-1904-3n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
@@ -783,6 +871,10 @@
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
     dpdk-compare-topologies-cmp:
       csit-dpdk-perf-verify-1904-2n-skx:
         - 2   # NDRPDR sel
     dpdk-compare-topologies-cmp:
       csit-dpdk-perf-verify-1904-2n-skx:
         - 2   # NDRPDR sel
@@ -1256,9 +1348,16 @@
       - 71  # NDRPDR LB
     # TODO: Add 1904 Data
     csit-vpp-perf-verify-1904-3n-hsw:
       - 71  # NDRPDR LB
     # TODO: Add 1904 Data
     csit-vpp-perf-verify-1904-3n-hsw:
-      - 1   # MRR sel - replace
+      - 9   # MRR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 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
 
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
 
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
@@ -1297,15 +1396,20 @@
       - 65  # NDRPDR LB
       - 66  # NDRPDR LB
       - 67  # NDRPDR LB
       - 65  # NDRPDR LB
       - 66  # NDRPDR LB
       - 67  # NDRPDR LB
-    # TODO: Add 1904 data
     csit-vpp-perf-verify-1904-3n-skx:
       - 7   # MRR sel
     csit-vpp-perf-verify-1904-3n-skx:
       - 7   # MRR sel
+      - 26  # NDRPDR full
+      - 27  # NDRPDR full
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR 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
 
     csit-vpp-perf-verify-1810-2n-skx:
       - 8   # MRR sel
 
     csit-vpp-perf-verify-1810-2n-skx:
       - 8   # MRR sel
@@ -1334,20 +1438,14 @@
       - 40  # NDRPDR sel
       - 42  # NDRPDR sel
       - 43  # NDRPDR sel
       - 40  # NDRPDR sel
       - 42  # NDRPDR sel
       - 43  # NDRPDR sel
-      - 24  # NFV MRR
-      - 26  # NFV MRR
-      - 27  # NFV MRR
-      - 35  # NFV MRR
-      - 37  # NFV MRR
-      - 28  # NFV NDRPDR
-      - 29  # NFV NDRPDR
-      - 32  # NFV NDRPDR
-      - 39  # NFV NDRPDR
-      - 46  # NFV NDRPDR
       - 45  # SOAK
     # TODO: Add 1904 data
     csit-vpp-perf-verify-1904-2n-skx:
       - 11  # MRR sel
       - 45  # SOAK
     # TODO: Add 1904 data
     csit-vpp-perf-verify-1904-2n-skx:
       - 11  # MRR sel
+      - 33  # NDRPDR full
+      - 39  # NDRPDR full
+      - 58  # NDRPDR full
+      - 62  # NDRPDR full
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 16  # NDRPDR sel
       - 12  # NDRPDR sel
       - 14  # NDRPDR sel
       - 16  # NDRPDR sel
@@ -1357,25 +1455,38 @@
       - 27  # NDRPDR sel
       - 30  # NDRPDR sel
       - 31  # NDRPDR sel
       - 27  # NDRPDR sel
       - 30  # NDRPDR sel
       - 31  # NDRPDR sel
-      - 10  # NFV MRR - replace
-      - 9   # NFV NDRPDR - replace
-
-    # TODO: Remove
-    csit-ligato-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR full
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-    # TODO: Add 1904 data
-#    csit-ligato-perf-verify-1904-3n-hsw:
-#      -
+      - 32  # NDRPDR sel
+      - 40  # NFV MRR 64b
+      - 41  # NFV MRR 64b
+      - 42  # NFV MRR 64b
+      - 47  # NFV MRR 64b
+      - 48  # NFV MRR 64b
+      - 49  # NFV MRR IMIX
+      - 50  # NFV MRR IMIX
+      - 51  # NFV MRR IMIX
+      - 54  # NFV MRR IMIX
+      - 55  # NFV MRR IMIX
+      - 56  # NFV NDRPDR 64b
+      - 59  # NFV NDRPDR 64b
+      - 60  # NFV NDRPDR 64b
+      - 61  # NFV NDRPDR IMIX
+      - 63  # NFV NDRPDR IMIX
+
+#    csit-ligato-perf-verify-1901-3n-hsw:
+#      - 10  # NDRPDR full
+#      - 8   # NDRPDR sel
+#      - 9   # NDRPDR sel
+#      - 11  # NDRPDR sel
+#      - 12  # NDRPDR sel
+#      - 13  # NDRPDR sel
+#      - 14  # NDRPDR sel
+#      - 15  # NDRPDR sel
+#      - 16  # NDRPDR sel
+#      - 17  # NDRPDR sel
+#      - 18  # NDRPDR sel
+#    # TODO: Add 1904 data
+##    csit-ligato-perf-verify-1904-3n-hsw:
+##      -
 
     csit-dpdk-perf-verify-1810-3n-hsw:
       - 1   # NDRPDR sel
 
     csit-dpdk-perf-verify-1810-3n-hsw:
       - 1   # NDRPDR sel
@@ -1399,12 +1510,17 @@
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-    # TODO: Add 1904 data
     csit-dpdk-perf-verify-1904-3n-hsw:
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
       - 5   # NDRPDR sel
       - 6   # NDRPDR sel
     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
 
     csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
 
     csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
@@ -1428,7 +1544,6 @@
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
-    # TODO: Add 1904 data
     csit-dpdk-perf-verify-1904-3n-skx:
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
     csit-dpdk-perf-verify-1904-3n-skx:
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
@@ -1436,6 +1551,10 @@
       - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 7   # 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-1810-2n-skx:
       - 3   # NDRPDR sel
 
     csit-dpdk-perf-verify-1810-2n-skx:
       - 3   # NDRPDR sel
@@ -1483,7 +1602,7 @@
     csit-dmm-functional-1904-ubuntu1604-virl:
       - 1
     csit-hc2vpp-verify-func-1904-ubuntu1604:
     csit-dmm-functional-1904-ubuntu1604-virl:
       - 1
     csit-hc2vpp-verify-func-1904-ubuntu1604:
-      - 1
+      - 4
 
 - type: "output"
   output: "report"
 
 - type: "output"
   output: "report"
@@ -3266,24 +3385,24 @@
   - "name"
   - "conf-history"
 
   - "name"
   - "conf-history"
 
-# Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
-- type: "table"
-  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "ligato-perf-results-3n-hsw"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+## Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
+#- type: "table"
+#  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "Status"
+#    data: "data msg"
+#  rows: "generated"
+#  data: "ligato-perf-results-3n-hsw"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
 
 # Detailed Test Results - VPP Device Results - Ubuntu
 - type: "table"
 
 # Detailed Test Results - VPP Device Results - Ubuntu
 - type: "table"
@@ -4249,22 +4368,22 @@
   - "parent"
   data-start-level: 2
 
   - "parent"
   data-start-level: 2
 
-# Container Orchestrated Performance Results 3n-hsw
-- type: "file"
-  title: "Container Orchestrated Performance Results 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
-  data: "ligato-perf-results-3n-hsw"
-  filter: "all"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## Container Orchestrated Performance Results 3n-hsw
+#- type: "file"
+#  title: "Container Orchestrated Performance Results 3n-hsw"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
+#  data: "ligato-perf-results-3n-hsw"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # DPDK Performance Results 3n-hsw
 - type: "file"
 
 # DPDK Performance Results 3n-hsw
 - type: "file"
@@ -4423,21 +4542,27 @@
     layout: "plot-soak-throughput"
 
 ################################################################################
     layout: "plot-soak-throughput"
 
 ################################################################################
-# Plots - NF Density - VSC
-
+# Plots - NF Density - VSC - MRR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4447,22 +4572,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  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: "64B 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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4472,22 +4636,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - VSC - MRR IMIX
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"
            'IMIX' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4497,22 +4669,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"
            'IMIX' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4522,22 +4733,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - VSC - NDR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4547,22 +4766,29 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4572,23 +4798,63 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
-           'IMIX' and
-           '2T1C' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
            'NDRPDR'"
            'NDRPDR'"
-  parameters:
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  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: "64B 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 - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  parameters:
   - "throughput"
   - "name"
   - "tags"
   - "throughput"
   - "name"
   - "tags"
@@ -4597,22 +4863,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4622,22 +4927,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - VSC - PDR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4647,22 +4960,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4672,22 +5024,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - VSC - PDR IMIX
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4697,22 +5057,29 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'VM' and
+           'VHOST' and
            'CHAIN' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4722,25 +5089,63 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
-################################################################################
-# Plots - NF Density - CSC
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "VNF-1c"
+  compare:
+    include: "1"
+    name: "VNF-0.5c"
+  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 - CSC - MRR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4750,22 +5155,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4775,22 +5219,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSC - MRR IMIX
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"
            'IMIX' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4800,22 +5252,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"
            'IMIX' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -4825,22 +5316,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSC - NDR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4850,22 +5349,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4875,22 +5413,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSC - NDR IMIX
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4900,22 +5446,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4925,22 +5510,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSC - PDR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4950,22 +5543,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -4975,22 +5607,30 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSC - PDR IMIX
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5000,22 +5640,61 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5025,25 +5704,31 @@
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 ################################################################################
     layout: "plot-service-density"
 
 ################################################################################
-# Plots - NF Density - CSP
-
+# Plots - NF Density - CSP - MRR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5053,22 +5738,29 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5078,23 +5770,63 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
-           'IMIX' and
-           '2T1C' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
            'MRR'"
            'MRR'"
-  parameters:
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  parameters:
   - "result"
   - "name"
   - "tags"
   - "result"
   - "name"
   - "tags"
@@ -5103,22 +5835,61 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"
            'IMIX' and
            '4T2C' and
            'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
@@ -5128,22 +5899,30 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSP - NDR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5153,22 +5932,61 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5178,22 +5996,30 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSP - NDR IMIX
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5203,22 +6029,61 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5228,22 +6093,30 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSP - PDR 64b
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5253,22 +6126,61 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-64b"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           '64B' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5278,22 +6190,30 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
     layout: "plot-service-density"
 
+# Plots - NF Density - CSP - PDR IMIX
 - type: "plot"
 - type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5303,22 +6223,61 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap_compare"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
-  data: "plot-vpp-nfv-2n-skx"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
            'DOCKER' and
            'PIPELINE' and
+           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
+  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_service_density_heatmap_compare"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr-imix"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  reference:
+    include: "2"
+    name: "CNF-1c"
+  compare:
+    include: "1"
+    name: "CNF-0.5c"
   parameters:
   - "throughput"
   - "name"
   parameters:
   - "throughput"
   - "name"
@@ -5328,7 +6287,7 @@
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   y-axis: "Y = Number of Service Pipelines"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 ################################################################################
     layout: "plot-service-density"
 
 ################################################################################
@@ -8263,537 +9222,537 @@
 
 ################################################################################
 
 
 ################################################################################
 
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput"
 
 ################################################################################
 
 
 ################################################################################
 
@@ -18434,242 +19393,242 @@
 
 ################################################################################
 
 
 ################################################################################
 
-# Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
-- type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x520 - l2bd
-- type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x710 - l2xc
-- type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - VPP Container Memif 3n-hsw-x710 - l2bd
-- type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-    layout: "plot-latency"
-
+## Packet Latency - VPP Container Memif 3n-hsw-x520 - l2xc
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP Container Memif 3n-hsw-x520 - l2bd
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP Container Memif 3n-hsw-x710 - l2xc
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+#    layout: "plot-latency"
+#
+## Packet Latency - VPP Container Memif 3n-hsw-x710 - l2bd
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+#    layout: "plot-latency"
+#
+#- type: "plot"
+#  title: "VPP Latency: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+#  algorithm: "plot_latency_error_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr-lat"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "latency"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+#    layout: "plot-latency"
+
 ################################################################################
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 base and scale
 ################################################################################
 
 # Packet Latency - VPP IPv4 3n-hsw-x520 base and scale
@@ -22102,216 +23061,69 @@
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   data: "plot-dpdk-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
-
-# Packet Latency - DPDK testpmd 2n-skx-xxv710
-- type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
-    layout: "plot-latency"
-
-- type: "plot"
-  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  algorithm: "plot_latency_error_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
-  data: "plot-dpdk-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'BASE' and
-           'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
-  parameters:
-  - "latency"
-  - "parent"
-  - "tags"
-  layout:
-    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
-    layout: "plot-latency"
-
-################################################################################
-
-# Speedup - VPP Container Memif 3n-hsw-x520
-- type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x520-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
-  layout:
-    title: "memif-3n-hsw-x520-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container Memif 3n-hsw-x710
-- type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   layout:
   layout:
-    title: "memif-3n-hsw-x710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-x710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
 
+# Packet Latency - DPDK testpmd 2n-skx-xxv710
 - type: "plot"
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   layout:
   layout:
-    title: "memif-3n-hsw-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-2t1c-base-ndr"
+    layout: "plot-latency"
 
 
-# Speedup - VPP Container Memif 3n-hsw-xl710
 - type: "plot"
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
+  title: "DPDK Latency: testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,DPDK]}/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat"
+  data: "plot-dpdk-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-           not 'VHOST' and
-           'MEMIF'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH')"
   parameters:
   parameters:
-  - "throughput"
+  - "latency"
   - "parent"
   - "tags"
   - "parent"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "IP4FWD"
   layout:
   layout:
-    title: "memif-3n-hsw-xl710-64b-base_and_features-ndr"
-    layout: "plot-throughput-speedup-analysis"
+    title: "testpmd-2n-skx-xxv710-64b-4t2c-base-ndr"
+    layout: "plot-latency"
 
 
+################################################################################
+
+# Speedup - VPP Container Memif 3n-hsw-x520
 - type: "plot"
 - type: "plot"
-  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
+  title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -22331,17 +23143,16 @@
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
-    title: "memif-3n-hsw-xl710-64b-base_and_features-pdr"
+    title: "memif-3n-hsw-x520-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-skx-x710
 - type: "plot"
 - type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  title: "Speedup: memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-base_and_features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
@@ -22361,15 +23172,16 @@
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
-    title: "memif-3n-skx-x710-64b-base_and_features-ndr"
+    title: "memif-3n-hsw-x520-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP Container Memif 3n-hsw-x710
 - type: "plot"
 - type: "plot"
-  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
@@ -22390,23 +23202,21 @@
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
-    title: "memif-3n-skx-x710-64b-base_and_features-pdr"
+    title: "memif-3n-hsw-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 2n-skx-x710
 - type: "plot"
 - type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
+  title: "Speedup: memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-base_and_features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"
@@ -22421,22 +23231,22 @@
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
-    title: "memif-2n-skx-x710-64b-base_and_features-ndr"
+    title: "memif-3n-hsw-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP Container Memif 3n-hsw-xl710
 - type: "plot"
 - type: "plot"
-  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
+  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
            'MEMIF'"
   parameters:
   - "throughput"
@@ -22451,253 +23261,109 @@
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
   - "L2BDMACLRN"
   - "IP4FWD"
   layout:
-    title: "memif-2n-skx-x710-64b-base_and_features-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-## Speedup - VPP Container Memif 2n-skx-xxv710
-#- type: "plot"
-#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-base_and_features-ndr"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  algorithm: "plot_throughput_speedup_analysis"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-#  filter: "'NIC_Intel-XXV710' and
-#           '64B' and
-#           ('BASE' or 'SCALE') and
-#           'NDRPDR' and
-#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
-#           not 'VHOST' and
-#           'MEMIF'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2XCFWD"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  layout:
-#    title: "memif-2n-skx-xxv710-64b-base_and_features-pdr"
-#    layout: "plot-throughput-speedup-analysis"
-
-################################################################################
-
-# Speedup - VPP Container k8s memif 3n-hsw-x520 - l2xc
-- type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'L2XCFWD' and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr"
-    layout: "plot-throughput-speedup-analysis"
-
-# Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
-- type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
-           not 'VHOST' and
-           not 'NF_DENSITY' and
-           'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
-  layout:
-    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
+    title: "memif-3n-hsw-xl710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
+  title: "Speedup: memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-base_and_features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr"
+    title: "memif-3n-hsw-xl710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
+# Speedup - VPP Container Memif 3n-skx-x710
 - type: "plot"
 - type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
+    title: "memif-3n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
+  title: "Speedup: memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-base_and_features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
-           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr"
+    title: "memif-3n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
+# Speedup - VPP Container Memif 2n-skx-x710
 - type: "plot"
 - type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
+  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
@@ -22706,26 +23372,28 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
+    title: "memif-2n-skx-x710-64b-base_and_features-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
+  title: "Speedup: memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
   algorithm: "plot_throughput_speedup_analysis"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
-  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-base_and_features-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
            not 'VHOST' and
            not 'NF_DENSITY' and
            'MEMIF'"
@@ -22734,15 +23402,306 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   layout:
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr"
+    title: "memif-2n-skx-x710-64b-base_and_features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
     layout: "plot-throughput-speedup-analysis"
 
+## Speedup - VPP Container Memif 2n-skx-xxv710
+#- type: "plot"
+#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-base_and_features-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-base_and_features-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+#           not 'VHOST' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2XCFWD"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  layout:
+#    title: "memif-2n-skx-xxv710-64b-base_and_features-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
+################################################################################
+
+## Speedup - VPP Container k8s memif 3n-hsw-x520 - l2xc
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-ndr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2xc"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Speedup - VPP Container k8s memif 3n-hsw-x520 - l2bd
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-ndr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-ndr-l2bd"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x520-64b-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Speedup - VPP Container Memif 3n-hsw-x710 - l2xc
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'L2XCFWD' and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2xc-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+## Speedup - VPP Container Memif 3n-hsw-x710 - l2bd
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr-tsa"
+#  data: "plot-ligato-throughput-lat-tsa-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+#           not 'VHOST' and
+#           not 'NF_DENSITY' and
+#           'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "1VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  - "2VNF"
+#  - "4VNF"
+#  layout:
+#    title: "k8s-memif-3n-hsw-x710-64b-base_and_scale-l2bd-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Speedup - VPP IPv4 3n-hsw-x520 base and scale
 ################################################################################
 
 # Speedup - VPP IPv4 3n-hsw-x520 base and scale
Integration tests