CSIT-1488: Add data to the Report 1904
[csit.git] / resources / tools / presentation / specification.yaml
index e9c148f..f745772 100644 (file)
     # 3n-hsw
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
         - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
 
-    plot-vpp-http-server-performance:
-      # TODO: Replace with 1904 data
-      # csit-vpp-perf-verify-1904-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-        - 28  # WRK
-        - 29  # WRK
-        - 30  # WRK
-        - 31  # WRK
-        - 32  # WRK
-        - 33  # WRK
-        - 34  # WRK
-        - 35  # WRK
-        - 36  # WRK
-        - 37  # WRK
-
-    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-vpp-http-server-performance:
+#      # csit-vpp-perf-verify-1904-3n-hsw:
+#      csit-vpp-perf-verify-1810-3n-hsw:
+#        - 28  # WRK
+#        - 29  # WRK
+#        - 30  # WRK
+#        - 31  # WRK
+#        - 32  # WRK
+#        - 33  # WRK
+#        - 34  # WRK
+#        - 35  # WRK
+#        - 36  # WRK
+#        - 37  # WRK
+
+#    plot-ligato-throughput-lat-tsa-3n-hsw:
+#      # 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:
       csit-dpdk-perf-verify-1904-3n-hsw:
         - 32  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
-      # TODO: Replace with 1904 data
-      # csit-vpp-perf-verify-1904-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-        - 45  # SOAK sel
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 70  # soak
+        - 71  # soak
 
     plot-vpp-nfv-2n-skx-ndrpdr-64b:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 9   # NFV NDRPDR - replace
+        - 56  # NFV NDRPDR 64b
+        - 59  # NFV NDRPDR 64b
+        - 60  # NFV NDRPDR 64b
+        - 65  # NFV NDRPDR 64b
+        - 68  # NFV NDRPDR 64b
+        - 80  # NFV MRR NDRPDR 64b IMIX
+        - 81  # NFV MRR NDRPDR 64b IMIX
+        - 84  # NFV MRR NDRPDR 64b IMIX
+        - 85  # NFV MRR NDRPDR 64b IMIX
+        - 86  # NFV MRR NDRPDR 64b IMIX
 
     plot-vpp-nfv-2n-skx-ndrpdr-imix:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 9   # NFV NDRPDR - replace
+        - 66  # NFV NDRPDR IMIX
+        - 67  # NFV NDRPDR IMIX
+        - 69  # NFV NDRPDR IMIX
+        - 82  # NFV NDRPDR IMIX
+        - 83  # NFV NDRPDR IMIX
+        - 80  # NFV MRR NDRPDR 64b IMIX
+        - 81  # NFV MRR NDRPDR 64b IMIX
+        - 84  # NFV MRR NDRPDR 64b IMIX
+        - 85  # NFV MRR NDRPDR 64b IMIX
+        - 86  # NFV MRR NDRPDR 64b IMIX
 
     plot-vpp-nfv-2n-skx-mrr-64b:
       csit-vpp-perf-verify-1904-2n-skx:
         - 42  # NFV MRR 64b
         - 47  # NFV MRR 64b
         - 48  # NFV MRR 64b
+        - 80  # NFV MRR NDRPDR 64b IMIX
+        - 81  # NFV MRR NDRPDR 64b IMIX
+        - 84  # NFV MRR NDRPDR 64b IMIX
+        - 85  # NFV MRR NDRPDR 64b IMIX
+        - 86  # NFV MRR NDRPDR 64b IMIX
 
     plot-vpp-nfv-2n-skx-mrr-imix:
-      # TODO: Add 1904 data
       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
+        - 80  # NFV MRR NDRPDR 64b IMIX
+        - 81  # NFV MRR NDRPDR 64b IMIX
+        - 84  # NFV MRR NDRPDR 64b IMIX
+        - 85  # NFV MRR NDRPDR 64b IMIX
+        - 86  # NFV MRR NDRPDR 64b IMIX
 
     plot-dpdk-throughput-latency-2n-skx:
       csit-dpdk-perf-verify-1904-2n-skx:
 
     # 3rd party
 
-    # Denverton:
-    intel-dnv-vpp:
-      # TODO: Replace with 1904 data
-      # intel-dnv-vpp-release-1904:
-      intel-dnv-vpp-release-1901:
-        - 1
+#    # Denverton:
+#    intel-dnv-vpp:
+#      # intel-dnv-vpp-release-1904:
+#      intel-dnv-vpp-release-1901:
+#        - 1
 
     ###########################################################################
     # Simple tables (only one data set):
     # NIC Comparisons
 
     vpp-nic-comparison-3n-hsw:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
         - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
 
     vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
     # Results
 
     vpp-perf-results-3n-hsw:
-      # TODO: Replace with FULL 1904 data
+      # TODO: Add FULL 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
-        - 12  # NDRPDR sel
+        - 32  # NDRPDR full
+        - 33  # NDRPDR full
+        - 35  # NDRPDR full
+        - 36  # NDRPDR full
+        - 37  # NDRPDR full
+        - 38  # NDRPDR full
+        - 40  # NDRPDR full
+        - 45  # NDRPDR full
+        - 46  # NDRPDR full
+        - 48  # NDRPDR full
+        - 49  # NDRPDR full
 
     vpp-perf-results-3n-skx:
-      # TODO: Replace with FULL 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
-        - 10  # NDRPDR sel
+        - 26  # NDRPDR full
+        - 27  # NDRPDR full
+        - 30  # NDRPDR full
+        - 31  # NDRPDR full
 
     vpp-perf-results-2n-skx:
-      # TODO: Add FULL 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 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-func-results-ubuntu:
       csit-vpp-functional-1904-ubuntu1604-virl:
-        - 29
+        - 33
 
     vpp-func-results-centos:
       csit-vpp-functional-1904-centos7-virl:
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1904-ubuntu1804-1n-skx:
-        - 33
+        - 32
 
-    # 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:
+#      # 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:
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1904-ubuntu1604:
-        - 1
+        - 4
 
 #    # NSH SFC Functional
 #    nsh-func-results:
 
     # Performance changes
 
-    intel-dnv-vpp-changes-2n-dnv-h1:
-      intel-dnv-vpp-release-1810:
-        - 1
-    intel-dnv-vpp-changes-2n-dnv-ref:
-      intel-dnv-vpp-release-1901:
-        - 1
-    intel-dnv-vpp-changes-2n-dnv-cmp:
-      # TODO: Replace with 1904 data
-      # intel-dnv-vpp-release-1904:
-      intel-dnv-vpp-release-1901:
-        - 1
-    intel-dnv-vpp-changes-2n-dnv:
-      - "intel-dnv-vpp-changes-2n-dnv-h1"
-      - "intel-dnv-vpp-changes-2n-dnv-ref"
-      - "intel-dnv-vpp-changes-2n-dnv-cmp"
+#    intel-dnv-vpp-changes-2n-dnv-h1:
+#      intel-dnv-vpp-release-1810:
+#        - 1
+#    intel-dnv-vpp-changes-2n-dnv-ref:
+#      intel-dnv-vpp-release-1901:
+#        - 1
+#    intel-dnv-vpp-changes-2n-dnv-cmp:
+#      # intel-dnv-vpp-release-1904:
+#      intel-dnv-vpp-release-1901:
+#        - 1
+#    intel-dnv-vpp-changes-2n-dnv:
+#      - "intel-dnv-vpp-changes-2n-dnv-h1"
+#      - "intel-dnv-vpp-changes-2n-dnv-ref"
+#      - "intel-dnv-vpp-changes-2n-dnv-cmp"
 
     vpp-performance-changes-3n-hsw-h1:
       csit-vpp-perf-verify-1810-3n-hsw:
         - 70  # NDRPDR LB
         - 71  # NDRPDR LB
     vpp-performance-changes-3n-hsw-cmp:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
         - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
     vpp-performance-changes-3n-hsw:
       - "vpp-performance-changes-3n-hsw-h1"
       - "vpp-performance-changes-3n-hsw-ref"
       - "vpp-performance-changes-2n-skx-ref"
       - "vpp-performance-changes-2n-skx-cmp"
 
+    vpp-soak-vs-ndr-2n-skx-ref:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+    vpp-soak-vs-ndr-2n-skx-cmp:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 70  # soak
+        - 71  # soak
+    vpp-soak-vs-ndr-2n-skx:
+      csit-vpp-perf-verify-1904-2n-skx:
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 32  # NDRPDR sel
+        - 70  # soak
+        - 71  # soak
+
     vpp-performance-changes-3n-hsw-mrr-h1:
       csit-vpp-perf-verify-1810-3n-hsw:
         - 9   # MRR sel
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
         - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
     vpp-compare-testbeds-cmp:
       csit-vpp-perf-verify-1904-3n-skx:
         - 8   # NDRPDR sel
           size: 16
         zeroline: False
       yaxis:
-        title: "<b>Packet Throughput [Mpps]</b>"
+        title: "<b>Critical Rate Lower Bound [Mpps]</b>"
         titlefont:
           size: 16
         gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        tickformat: ".3s"
+        hoverformat: ".4r"
+        tickformat: ".3r"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         titlefont:
           size: 16
         gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        tickformat: ".3s"
+        hoverformat: ".4r"
+        tickformat: ".3r"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
     extract: "robot-plugin/output.xml"
 
   builds:
-    # TODO: Add 1904 data
-#    intel-dnv-vpp-release-1904:
+##    intel-dnv-vpp-release-1904:
+##      - 1
+#
+#    intel-dnv-vpp-release-1901:
+#      - 1
+#
+#    intel-dnv-vpp-release-1810:
 #      - 1
-
-    intel-dnv-vpp-release-1901:
-      - 1
-
-    intel-dnv-vpp-release-1810:
-      - 1
 
     csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
       - 39  # NDRPDR sel
       - 41  # NDRPDR sel
       - 42  # NDRPDR sel
-      - 28  # WRK
-      - 29  # WRK
-      - 30  # WRK
-      - 31  # WRK
-      - 32  # WRK
-      - 33  # WRK
-      - 34  # WRK
-      - 35  # WRK
-      - 36  # WRK
-      - 37  # WRK
+#      - 28  # WRK
+#      - 29  # WRK
+#      - 30  # WRK
+#      - 31  # WRK
+#      - 32  # WRK
+#      - 33  # WRK
+#      - 34  # WRK
+#      - 35  # WRK
+#      - 36  # WRK
+#      - 37  # WRK
     csit-vpp-perf-verify-1901-3n-hsw:
       - 35  # MRR sel
       - 10  # NDRPDR sel
     # TODO: Add 1904 Data
     csit-vpp-perf-verify-1904-3n-hsw:
       - 9   # MRR sel
+      - 32  # NDRPDR full
+      - 33  # NDRPDR full
+      - 35  # NDRPDR full
+      - 36  # NDRPDR full
+      - 37  # NDRPDR full
+      - 38  # NDRPDR full
+      - 40  # NDRPDR full
+      - 45  # NDRPDR full
+      - 46  # NDRPDR full
+      - 48  # NDRPDR full
+      - 49  # NDRPDR full
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 20  # NDRPDR sel
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 26  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
 
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
       - 67  # NDRPDR LB
     csit-vpp-perf-verify-1904-3n-skx:
       - 7   # MRR sel
+      - 26  # NDRPDR full
+      - 27  # NDRPDR full
+      - 30  # NDRPDR full
+      - 31  # NDRPDR full
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
       - 40  # NDRPDR sel
       - 42  # NDRPDR sel
       - 43  # NDRPDR 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
       - 50  # NFV MRR IMIX
       - 51  # NFV MRR IMIX
       - 54  # NFV MRR IMIX
-      - 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:
-#      -
+      - 55  # NFV MRR IMIX
+      - 56  # NFV NDRPDR 64b
+      - 59  # NFV NDRPDR 64b
+      - 60  # NFV NDRPDR 64b
+      - 65  # NFV NDRPDR 64b
+      - 68  # NFV NDRPDR 64b
+      - 66  # NFV NDRPDR IMIX
+      - 67  # NFV NDRPDR IMIX
+      - 69  # NFV NDRPDR IMIX
+      - 82  # NFV NDRPDR IMIX
+      - 83  # NFV NDRPDR IMIX
+      - 80  # NFV MRR NDRPDR 64b IMIX
+      - 81  # NFV MRR NDRPDR 64b IMIX
+      - 84  # NFV MRR NDRPDR 64b IMIX
+      - 85  # NFV MRR NDRPDR 64b IMIX
+      - 86  # NFV MRR NDRPDR 64b IMIX
+      - 70  # soak
+      - 71  # soak
+
+#    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
+##    csit-ligato-perf-verify-1904-3n-hsw:
+##      -
 
     csit-dpdk-perf-verify-1810-3n-hsw:
       - 1   # NDRPDR sel
     csit-dmm-functional-1904-ubuntu1604-virl:
       - 1
     csit-hc2vpp-verify-func-1904-ubuntu1604:
-      - 1
+      - 4
 
 - type: "output"
   output: "report"
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 
+# VPP Soak vs NDR
+- type: "table"
+  title: "VPP Soak vs NDR 2n-skx"
+  algorithm: "table_soak_vs_ndr"
+  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-skx"
+  reference:
+    title: "NDR"
+    data: "vpp-soak-vs-ndr-2n-skx-ref"
+  compare:
+    title: "Soak"
+    data: "vpp-soak-vs-ndr-2n-skx-cmp"
+  data: "vpp-soak-vs-ndr-2n-skx"
+  include-tests: "NDR"
+  filter: "('NDRPDR' or 'SOAK')"
+  parameters:
+    - "throughput"
+    - "name"
+    - "parent"
+
+################################################################################
+
 # VPP Compare NICs 3n-hsw 1t1c ndr
 - type: "table"
   title: "VPP Compare NICs 3n-hsw 1t1c ndr"
 ################################################################################
 # VPP
 
-# VPP Performance Changes 2n-dnv 1t1c pdr
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 1t1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-pdr"
-  history:
-    - title: "rls1810"
-      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-  reference:
-    title: "rls1901"
-    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-  compare:
-    title: "rls1904"
-    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-  data: "intel-dnv-vpp-changes-2n-dnv"
-  include-tests: "PDR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2n-dnv 2t2c pdr
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 2t2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-pdr"
-  history:
-    - title: "rls1810"
-      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-  reference:
-    title: "rls1901"
-    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-  compare:
-    title: "rls1904"
-    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-  data: "intel-dnv-vpp-changes-2n-dnv"
-  include-tests: "PDR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2n-dnv 1t1c ndr
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 1t1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-ndr"
-  history:
-    - title: "rls1810"
-      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-  reference:
-    title: "rls1901"
-    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-  compare:
-    title: "rls1904"
-    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-  data: "intel-dnv-vpp-changes-2n-dnv"
-  include-tests: "NDR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2n-dnv 2t2c ndr
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 2t2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-ndr"
-  history:
-    - title: "rls1810"
-      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-  reference:
-    title: "rls1901"
-    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-  compare:
-    title: "rls1904"
-    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-  data: "intel-dnv-vpp-changes-2n-dnv"
-  include-tests: "NDR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2n-dnv 1t1c MRR
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 1t1c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
-  history:
-    - title: "rls1810"
-      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-  reference:
-    title: "rls1901"
-    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-  compare:
-    title: "rls1904"
-    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-  data: "intel-dnv-vpp-changes-2n-dnv"
-  include-tests: "MRR"
-  filter: "'1T1C' and 'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-
-# VPP Performance Changes 2n-dnv 2t2c MRR
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 2t2c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
-  history:
-    - title: "rls1810"
-      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-  reference:
-    title: "rls1901"
-    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-  compare:
-    title: "rls1904"
-    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-  data: "intel-dnv-vpp-changes-2n-dnv"
-  include-tests: "MRR"
-  filter: "'2T2C' and 'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-
-# VPP Performance Changes 2n-dnv 4t4c MRR
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 4t4c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
-  history:
-    - title: "rls1810"
-      data: "intel-dnv-vpp-changes-2n-dnv-h1"
-  reference:
-    title: "rls1901"
-    data: "intel-dnv-vpp-changes-2n-dnv-ref"
-  compare:
-    title: "rls1904"
-    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
-  data: "intel-dnv-vpp-changes-2n-dnv"
-  include-tests: "MRR"
-  filter: "'4T4C' and 'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
+## VPP Performance Changes 2n-dnv 1t1c pdr
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 1t1c pdr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-pdr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "PDR"
+#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#
+## VPP Performance Changes 2n-dnv 2t2c pdr
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 2t2c pdr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-pdr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "PDR"
+#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#
+## VPP Performance Changes 2n-dnv 1t1c ndr
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 1t1c ndr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-ndr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "NDR"
+#  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#
+## VPP Performance Changes 2n-dnv 2t2c ndr
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 2t2c ndr"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-ndr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "NDR"
+#  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "throughput"
+#
+## VPP Performance Changes 2n-dnv 1t1c MRR
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 1t1c MRR"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "MRR"
+#  filter: "'1T1C' and 'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "result"
+#
+## VPP Performance Changes 2n-dnv 2t2c MRR
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 2t2c MRR"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "MRR"
+#  filter: "'2T2C' and 'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "result"
+#
+## VPP Performance Changes 2n-dnv 4t4c MRR
+#- type: "table"
+#  title: "VPP Performance Changes 2n-dnv 4t4c MRR"
+#  algorithm: "table_performance_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
+#  history:
+#    - title: "rls1810"
+#      data: "intel-dnv-vpp-changes-2n-dnv-h1"
+#  reference:
+#    title: "rls1901"
+#    data: "intel-dnv-vpp-changes-2n-dnv-ref"
+#  compare:
+#    title: "rls1904"
+#    data: "intel-dnv-vpp-changes-2n-dnv-cmp"
+#  data: "intel-dnv-vpp-changes-2n-dnv"
+#  include-tests: "MRR"
+#  filter: "'4T4C' and 'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "result"
 
 # VPP Performance Changes 3n-hsw 1t1c pdr
 - type: "table"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "parent"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "parent"
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "parent"
   - "msg"
 
-# Detailed Test Results - VPP Performance Results 2n-dnv
-- type: "table"
-  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+## Detailed Test Results - VPP Performance Results 2n-dnv
+#- type: "table"
+#  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "Status"
+#    data: "data msg"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
 
 # Test configuration - VPP Performance Test Configs 3n-hsw
 - type: "table"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "parent"
   - "name"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
   - "conf-history"
 
-# Test configuration - VPP Performance Test Configs 2n-dnv
+## Test configuration - VPP Performance Test Configs 2n-dnv
+#- type: "table"
+#  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#    data: "data conf-history"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "parent"
+#  - "name"
+#  - "conf-history"
+
+# Test Operational Data - VPP Performance Operational Data 3n-hsw
 - type: "table"
-  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
-  algorithm: "table_details"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
   columns:
   - title: "Name"
     data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
-    data: "data conf-history"
+  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
   rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
-
-# Test Operational Data - VPP Performance Operational Data 3n-hsw
-- type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-    data: "data show-run"
-  rows: "generated"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "parent"
   - "name"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "parent"
   - "name"
   - "show-run"
 
-# Test Operational Data - VPP Performance Operational Data 2n-dnv
-- type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-    data: "data show-run"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "parent"
-  - "name"
-  - "show-run"
+## Test Operational Data - VPP Performance Operational Data 2n-dnv
+#- type: "table"
+#  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+#    data: "data show-run"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "parent"
+#  - "name"
+#  - "show-run"
 
 # Detailed Test Results - VPP MRR Results 3n-hsw
 - type: "table"
   - "parent"
   - "msg"
 
-# Detailed Test Results - VPP MRR Results 2n-dnv
-- type: "table"
-  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+## Detailed Test Results - VPP MRR Results 2n-dnv
+#- type: "table"
+#  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "Status"
+#    data: "data msg"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
 
 # Test configuration - VPP MRR Test Configs 3n-hsw
 - type: "table"
   - "name"
   - "conf-history"
 
-# Test configuration - VPP MRR Test Configs 2n-dnv
-- type: "table"
-  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
-    data: "data conf-history"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "parent"
-  - "name"
-  - "conf-history"
+## Test configuration - VPP MRR Test Configs 2n-dnv
+#- type: "table"
+#  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
+#  algorithm: "table_details"
+#  output-file-ext: ".csv"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
+#  columns:
+#  - title: "Name"
+#    data: "data name"
+#  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+#    data: "data conf-history"
+#  rows: "generated"
+#  data: "intel-dnv-vpp"
+#  filter: "'MRR'"
+#  parameters:
+#  - "parent"
+#  - "name"
+#  - "conf-history"
 
 # Detailed Test Results - VPP Functional Results - Ubuntu
 - type: "table"
   - "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"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Results 2n-dnv
-- type: "file"
-  title: "VPP Performance Results 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP Performance Results 2n-dnv
+#- type: "file"
+#  title: "VPP Performance Results 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP Performance Configuration 3n-hsw
 - type: "file"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Configuration 2n-dnv
-- type: "file"
-  title: "VPP Performance Configuration 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP Performance Configuration 2n-dnv
+#- type: "file"
+#  title: "VPP Performance Configuration 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP Performance Operational Data 3n-hsw
 - type: "file"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
   data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
   data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  filter: "not 'CFS_OPT'"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Operational Data 2n-dnv
-- type: "file"
-  title: "VPP Performance Operational Data 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP Performance Operational Data 2n-dnv
+#- type: "file"
+#  title: "VPP Performance Operational Data 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'NDRPDR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP MRR Results 3n-hsw
 - type: "file"
   - "parent"
   data-start-level: 3
 
-# VPP MRR Results 2n-dnv
-- type: "file"
-  title: "VPP MRR Results 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP MRR Results 2n-dnv
+#- type: "file"
+#  title: "VPP MRR Results 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP MRR Configuration 3n-hsw
 - type: "file"
   - "parent"
   data-start-level: 3
 
-# VPP MRR Configuration 2n-dnv
-- type: "file"
-  title: "VPP MRR Configuration 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+## VPP MRR Configuration 2n-dnv
+#- type: "file"
+#  title: "VPP MRR Configuration 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file-ext: ".rst"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv"
+#  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+#  dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
+#  data: "intel-dnv-vpp"
+#  filter: "'MRR'"
+#  parameters:
+#  - "name"
+#  - "doc"
+#  - "level"
+#  - "parent"
+#  data-start-level: 3
 
 # VPP Functional Results - Ubuntu
 - type: "file"
   - "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"
 ###                                P L O T S                                 ###
 ################################################################################
 
-# Soak test - 30min Soak Test (PLRsearch), boxes
+# Soak Test (PLRsearch), boxes
 - type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
-  algorithm: "plot_soak_boxes"
+  title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
   data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
+  filter: "('L2BDMACLRN' or 'L2PATCH' or 'L2XCBASE') and not 'VHOST' and not 'MEMIF'"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+    - "throughput"
+    - "parent"
+    - "tags"
   sort:
-  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
+    - "DRV_AVF"
+    - "DRV_AVF"
+    - "DRV_AVF"
+    - "L2BDMACLRN"
+    - "L2XCBASE"
+    - "L2PATCH"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "all"
+    whiskerwidth: 0
   layout:
-    title: "30min Soak Test (PLRsearch)"
+    title: "2 Hours Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
-# Soak test - example, not used
+# Soak Test (PLRsearch), boxes
 - type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
-  algorithm: "plot_soak_bars"
+  title: "VPP Critical rate: 2 Hours Soak Test (PLRsearch)"
+  algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
   data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
+  filter: "'L2BDMACLRN' and ('VHOST' or 'MEMIF') or 'IP4BASE' or 'IP6BASE'"
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+    - "throughput"
+    - "parent"
+    - "tags"
   sort:
-  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
+    - "VHOST"
+    - "MEMIF"
+    - "IP4FWD"
+    - "IP6FWD"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "all"
+    whiskerwidth: 0
   layout:
-    title: "30min Soak Test (PLRsearch)"
+    title: "2 Hours Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
 ################################################################################
   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-imix-base-vsc-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
   data: "plot-vpp-nfv-2n-skx-mrr-imix"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "VNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     include: "1"
     name: "CNF-0.5c"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
     layout: "plot-service-density"
 
 ################################################################################
-# Plots VPP HTTP Server Performance
-- type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
-  data:
-    "plot-vpp-http-server-performance"
-  # Keep this formatting, the filter is enclosed with " (quotation mark) and
-  # each tag is enclosed with ' (apostrophe).
-  filter: "'HTTP' and 'TCP_CPS'"
-  parameters:
-  - "result"
-  - "name"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "VPP HTTP Server Performance"
-    layout:
-      "plot-cps"
-
-- type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
-  data:
-    "plot-vpp-http-server-performance"
-  filter: "'HTTP' and 'TCP_RPS'"
-  parameters:
-  - "result"
-  - "name"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "VPP HTTP Server Performance"
-    layout:
-      "plot-rps"
+## Plots VPP HTTP Server Performance
+#- type: "plot"
+#  title: "VPP HTTP Server Performance"
+#  algorithm: "plot_http_server_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
+#  data:
+#    "plot-vpp-http-server-performance"
+#  # Keep this formatting, the filter is enclosed with " (quotation mark) and
+#  # each tag is enclosed with ' (apostrophe).
+#  filter: "'HTTP' and 'TCP_CPS'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "VPP HTTP Server Performance"
+#    layout:
+#      "plot-cps"
+#
+#- type: "plot"
+#  title: "VPP HTTP Server Performance"
+#  algorithm: "plot_http_server_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
+#  data:
+#    "plot-vpp-http-server-performance"
+#  filter: "'HTTP' and 'TCP_RPS'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "VPP HTTP Server Performance"
+#    layout:
+#      "plot-rps"
 
 ################################################################################
 
     title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-dnv-x553 base
+## Packet Throughput - VPP L2 2n-dnv-x553 base
+#- type: "plot"
+#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'BASE' and
+#           'NDRPDR' and
+#           'ETH' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           '1T1C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           '2T2C' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+
+################################################################################
+
+# Packet Throughput - VPP Container Memif 3n-hsw-x520
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   - "L2BDMACLRN"
-  - "L2PATCH"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   - "L2BDMACLRN"
-  - "L2PATCH"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           'ETH' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
-           not 'MEMIF'"
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   - "L2BDMACLRN"
-  - "L2PATCH"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  - "L2PATCH"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-################################################################################
-
-# Packet Throughput - VPP Container Memif 3n-hsw-x520
-- type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' 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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '1T1C' 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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           '2T2C' 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"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
 
 ################################################################################
 
-# 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"
 
 ################################################################################
 
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'DOT1Q' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           'IP4BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           'IP4BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
+## Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
+#- type: "plot"
+#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
     title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-dnv-x553 base
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '78B' and
-           'IP6BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '78B' and
-           'IP6BASE' and
-           'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '78B' and
-           'IP6BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '78B' and
-           'IP6BASE' and
-           'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP IPv6 2n-dnv-x553 base
+#- type: "plot"
+#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+#    layout: "plot-throughput"
 
 ################################################################################
 
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
 
 # Packet Latency - VPP L2 2n-skx-x710 base and scale
 - type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   - "FIB_100K"
   - "FIB_1M"
   layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base-ndr"
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-latency"
 
 - type: "plot"
-  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  title: "VPP Latency: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   algorithm: "plot_latency_error_bars"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base-ndr-lat"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   - "FIB_100K"
   - "FIB_1M"
   layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base-ndr"
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-latency"
 
 # Packet Latency - VPP L2 2n-skx-xxv710 base and scale
 
 ################################################################################
 
-# 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"
 
 ################################################################################
 
            'BASE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
            'BASE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
            'SCALE' and
            '1T1C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
            'SCALE' and
            '2T2C' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
            'NDRPDR' and
            '1T1C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
            'NDRPDR' and
            '2T2C' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "latency"
 
 ################################################################################
 
-# 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 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"
 
 ################################################################################
 
     title: "ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv4 2n-dnv-x553 base
-- type: "plot"
-  title: "Speedup: ip4-2n-dnv-x553-64b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           'IP4BASE' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  layout:
-    title: "ip4-2n-dnv-x553-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           'IP4BASE' and
-           'NDRPDR' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP4BASE"
-  layout:
-    title: "ip4-2n-dnv-x553-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP IPv4 2n-dnv-x553 base
+#- type: "plot"
+#  title: "Speedup: ip4-2n-dnv-x553-64b-base-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-base-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           'IP4BASE' and
+#           'NDRPDR' and
+#           'IP4FWD' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP4BASE"
+#  layout:
+#    title: "ip4-2n-dnv-x553-64b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
     title: "ip6-2n-skx-xxv710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP IPv6 2n-dnv-x553 base
-- type: "plot"
-  title: "Speedup: ip6-2n-dnv-x553-78b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-ndr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '78B' and
-           'IP6BASE' and
-           'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  layout:
-    title: "ip6-2n-dnv-x553-78b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: ip6-2n-dnv-x553-78b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-pdr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '78B' and
-           'IP6BASE' and
-           'NDRPDR' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "IP6BASE"
-  layout:
-    title: "ip6-2n-dnv-x553-78b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP IPv6 2n-dnv-x553 base
+#- type: "plot"
+#  title: "Speedup: ip6-2n-dnv-x553-78b-base-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-ndr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-base-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: ip6-2n-dnv-x553-78b-base-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-pdr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '78B' and
+#           'IP6BASE' and
+#           'NDRPDR' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  layout:
+#    title: "ip6-2n-dnv-x553-78b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
 
            'NDRPDR' and
            'BASE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'NDRPDR' and
            'BASE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'NDRPDR' and
            'SCALE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'NDRPDR' and
            'SCALE' and
            'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'IP4FWD' and
            'NDRPDR' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
            'IP4FWD' and
            'NDRPDR' and
            'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
            not 'VHOST'"
   parameters:
   - "throughput"
     title: "l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
-# Speedup - VPP L2 2n-dnv-x553 base
-- type: "plot"
-  title: "Speedup: l2sw-2n-dnv-x553-64b-base-ndr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-ndr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  - "L2PATCH"
-  layout:
-    title: "l2sw-2n-dnv-x553-64b-base-ndr"
-    layout: "plot-throughput-speedup-analysis"
-
-- type: "plot"
-  title: "Speedup: l2sw-2n-dnv-x553-64b-base-pdr-tsa"
-  algorithm: "plot_throughput_speedup_analysis"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-pdr-tsa"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
-  - "L2PATCH"
-  layout:
-    title: "l2sw-2n-dnv-x553-64b-base-pdr"
-    layout: "plot-throughput-speedup-analysis"
+## Speedup - VPP L2 2n-dnv-x553 base
+#- type: "plot"
+#  title: "Speedup: l2sw-2n-dnv-x553-64b-base-ndr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-ndr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-base-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: l2sw-2n-dnv-x553-64b-base-pdr-tsa"
+#  algorithm: "plot_throughput_speedup_analysis"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-pdr-tsa"
+#  data: "intel-dnv-vpp"
+#  filter: "'NIC_Intel-X553' and
+#           '64B' and
+#           ('BASE' or 'SCALE') and
+#           'NDRPDR' and
+#           'ETH' and
+#           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+#           not 'VHOST' and
+#           not 'MEMIF'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "L2PATCH"
+#  layout:
+#    title: "l2sw-2n-dnv-x553-64b-base-pdr"
+#    layout: "plot-throughput-speedup-analysis"
 
 ################################################################################