CSIT-1488: Add data to the Report 1904
[csit.git] / resources / tools / presentation / specification.yaml
index d4d927a..5d33421 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
         - 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-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
         - 31  # NDRPDR sel
         - 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
+#    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
 
     plot-vpp-nfv-2n-skx-ndrpdr-64b:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 56  # NFV NDRPDR 64b
         - 59  # NFV NDRPDR 64b
         - 60  # NFV NDRPDR 64b
+        - 65  # NFV NDRPDR 64b
+        - 68  # NFV NDRPDR 64b
 
     plot-vpp-nfv-2n-skx-ndrpdr-imix:
       # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
-        - 61  # NFV NDRPDR IMIX
-        - 63  # NFV NDRPDR IMIX
+        - 66  # NFV NDRPDR IMIX
+        - 67  # NFV NDRPDR IMIX
+        - 69  # NFV NDRPDR IMIX
 
     plot-vpp-nfv-2n-skx-mrr-64b:
       csit-vpp-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:
+#      # TODO: Replace with 1904 data
+#      # 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
         - 25  # NDRPDR sel
         - 26  # NDRPDR sel
         - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
 
     vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
         - 12  # NDRPDR sel
 
     vpp-perf-results-3n-skx:
-      # TODO: Add FULL 1904 data
       csit-vpp-perf-verify-1904-3n-skx:
         - 26  # NDRPDR full
         - 27  # NDRPDR full
+        - 30  # NDRPDR full
+        - 31  # NDRPDR full
 
     vpp-perf-results-2n-skx:
       csit-vpp-perf-verify-1904-2n-skx:
 
     # 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:
+#      # 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"
 
     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
         - 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"
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-3n-hsw:
         - 11  # NDRPDR sel
         - 12  # 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
     extract: "robot-plugin/output.xml"
 
   builds:
-    # TODO: Add 1904 data
-#    intel-dnv-vpp-release-1904:
+#    # TODO: Add 1904 data
+##    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
       - 25  # NDRPDR sel
       - 26  # NDRPDR sel
       - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
 
     csit-vpp-perf-verify-1810-3n-skx:
       - 9   # MRR sel
       - 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
+#      - 45  # SOAK
     # TODO: Add 1904 data
     csit-vpp-perf-verify-1904-2n-skx:
       - 11  # MRR sel
       - 56  # NFV NDRPDR 64b
       - 59  # NFV NDRPDR 64b
       - 60  # NFV NDRPDR 64b
-      - 61  # NFV NDRPDR IMIX
-      - 63  # NFV NDRPDR IMIX
+      - 65  # NFV NDRPDR 64b
+      - 68  # NFV NDRPDR 64b
+      - 66  # NFV NDRPDR IMIX
+      - 67  # NFV NDRPDR IMIX
+      - 69  # NFV NDRPDR IMIX
 
 #    csit-ligato-perf-verify-1901-3n-hsw:
 #      - 10  # NDRPDR full
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 # 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"
   - "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"
   - "name"
   - "conf-history"
 
-# 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 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"
   - "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
+## 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"
-  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
+  title: "Test configuration - VPP MRR Test Configs 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
   columns:
   - title: "Name"
     data: "data name"
-  - title: "Status"
-    data: "data msg"
+  - title: "VPP API Test Commands History - Commands Used Per Test Case"
+    data: "data conf-history"
   rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Test configuration - VPP MRR Test Configs 3n-hsw
-- type: "table"
-  title: "Test configuration - VPP MRR Test Configs 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
-  columns:
-  - title: "Name"
-    data: "data name"
-  - title: "VPP API Test Commands History - Commands Used Per Test Case"
-    data: "data conf-history"
-  rows: "generated"
-  data: "vpp-mrr-results-3n-hsw"
+  data: "vpp-mrr-results-3n-hsw"
   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"
+## 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"
   - "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"
   - "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"
   - "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"
 ###                                P L O T S                                 ###
 ################################################################################
 
-# Soak test - 30min Soak Test (PLRsearch), boxes
-- type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
-  algorithm: "plot_soak_boxes"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
-  data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
-  layout:
-    title: "30min Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-# Soak test - example, not used
-- type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
-  algorithm: "plot_soak_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
-  data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
-  layout:
-    title: "30min Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
+## Soak test - 30min Soak Test (PLRsearch), boxes
+#- type: "plot"
+#  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
+#  algorithm: "plot_soak_boxes"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
+#  data: "plot-vpp-soak-2n-skx"
+#  filter: "'SOAK'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2PATCH"
+##  - "L2XCBASE"
+##  - "L2BDMACLRN"
+##  - "IP4FWD"
+##  - "IP6FWD"
+#  - "VHOST"
+#  layout:
+#    title: "30min Soak Test (PLRsearch)"
+#    layout: "plot-soak-throughput"
+#
+## Soak test - example, not used
+#- type: "plot"
+#  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
+#  algorithm: "plot_soak_bars"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
+#  data: "plot-vpp-soak-2n-skx"
+#  filter: "'SOAK'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "L2PATCH"
+##  - "L2XCBASE"
+##  - "L2BDMACLRN"
+##  - "IP4FWD"
+##  - "IP6FWD"
+#  - "VHOST"
+#  layout:
+#    title: "30min Soak Test (PLRsearch)"
+#    layout: "plot-soak-throughput"
 
 ################################################################################
 # Plots - NF Density - VSC - MRR 64b
     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
-- 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 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"
 
 ################################################################################
 
     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 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"
 
 ################################################################################
 
     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"
 
 ################################################################################
 
 
 # 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
     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"
 
 ################################################################################
 
     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"
 
 ################################################################################