X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=712c28b409ecbb34c92bfbc4c5e2664474d1a1e2;hb=refs%2Fchanges%2F15%2F25715%2F28;hp=5aeaa04e7c370d6b911f1460afc3bcd459dc140d;hpb=d0d8afac764d80ef2cd1c4c19522125d733b4348;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 5aeaa04e7c..712c28b409 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -477,7 +477,6 @@
     # 3n-tsh
 
     plot-vpp-throughput-lat-tsa-3n-tsh:
-      # TODO: Add the data
       csit-vpp-perf-verify-2001-3n-tsh:
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
@@ -488,6 +487,7 @@
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
+        - 21  # NDRPDR sel
 
     plot-vpp-hdrh-lat-3n-tsh:
       csit-vpp-perf-verify-2001-3n-tsh:
@@ -962,7 +962,6 @@
         - 15  # NDRPDR sel
         - 16  # NDRPDR sel
     vpp-performance-changes-3n-tsh-cmp:
-      # TODO: Add the data
       csit-vpp-perf-verify-2001-3n-tsh:
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
@@ -973,6 +972,7 @@
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
+        - 21  # NDRPDR sel
     vpp-performance-changes-3n-tsh:
       - "vpp-performance-changes-3n-tsh-ref"
       - "vpp-performance-changes-3n-tsh-cmp"
@@ -2445,6 +2445,7 @@
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
+      - 21  # NDRPDR sel
       - 9   # MRR sel
 
     csit-vpp-perf-verify-1908-3n-dnv:
@@ -4673,7 +4674,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-hsw"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4690,7 +4691,7 @@
 #- type: "table"
 #  title: "Detailed Test Results - VPP Performance Results 3n-skx"
 #  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
+#  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
@@ -4707,7 +4708,7 @@
 #- type: "table"
 #  title: "Detailed Test Results - VPP Performance Results 2n-skx"
 #  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
+#  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
@@ -4724,7 +4725,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-clx"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}/vpp_performance_results_2n_clx"
+  output-file: "{DIR[DTR,PERF,VPP,2N,CLX]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4741,7 +4742,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-tsh"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}/vpp_performance_results_3n_tsh"
+  output-file: "{DIR[DTR,PERF,VPP,3N,TSH]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4758,7 +4759,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/vpp_performance_results_3n_dnv"
+  output-file: "{DIR[DTR,PERF,VPP,3N,DNV]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4792,7 +4793,7 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-hsw"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4809,7 +4810,7 @@
 #- type: "table"
 #  title: "Test configuration - VPP Performance Test Configs 3n-skx"
 #  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
+#  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
@@ -4826,7 +4827,7 @@
 #- type: "table"
 #  title: "Test configuration - VPP Performance Test Configs 2n-skx"
 #  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
+#  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
@@ -4843,7 +4844,7 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-clx"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}/vpp_test_configuration_2n_clx"
+  output-file: "{DIR[DTC,PERF,VPP,2N,CLX]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4860,7 +4861,7 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-tsh"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}/vpp_test_configuration_3n_tsh"
+  output-file: "{DIR[DTC,PERF,VPP,3N,TSH]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4877,7 +4878,7 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}/vpp_test_configuration_3n_dnv"
+  output-file: "{DIR[DTC,PERF,VPP,3N,DNV]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4894,7 +4895,7 @@
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4911,7 +4912,7 @@
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
   algorithm: "table_oper_data_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/"
   data: "vpp-perf-results-3n-hsw"
   filter: "all"
 
@@ -4919,7 +4920,7 @@
 #- type: "table"
 #  title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
 #  algorithm: "table_oper_data_html"
-#  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_test_operational_3n_skx"
+#  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/"
 #  data: "vpp-perf-results-3n-skx"
 #  filter: "all"
 #
@@ -4927,7 +4928,7 @@
 #- type: "table"
 #  title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
 #  algorithm: "table_oper_data_html"
-#  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_test_operational_2n_skx"
+#  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/"
 #  data: "vpp-perf-results-2n-skx"
 #  filter: "all"
 
@@ -4935,7 +4936,7 @@
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 2n-clx"
   algorithm: "table_oper_data_html"
-  output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}/vpp_test_operational_2n_clx"
+  output-file: "{DIR[DTO,PERF,VPP,2N,CLX]}/"
   data: "vpp-perf-results-2n-clx"
   filter: "all"
 
@@ -4943,7 +4944,7 @@
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-tsh"
   algorithm: "table_oper_data_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}/vpp_test_operational_3n_tsh"
+  output-file: "{DIR[DTO,PERF,VPP,3N,TSH]}/"
   data: "vpp-perf-results-3n-tsh"
   filter: "all"
 
@@ -4951,7 +4952,7 @@
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-dnv"
   algorithm: "table_oper_data_html"
-  output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/vpp_test_operational_3n_dnv"
+  output-file: "{DIR[DTO,PERF,VPP,3N,DNV]}/"
   data: "vpp-perf-results-3n-dnv"
   filter: "all"
 
@@ -4959,7 +4960,7 @@
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
   algorithm: "table_oper_data_html"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
+  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/"
   data: "vpp-perf-results-2n-dnv"
   filter: "all"
 
@@ -4967,7 +4968,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-hsw"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
+  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -4984,7 +4985,7 @@
 #- type: "table"
 #  title: "Detailed Test Results - VPP MRR Results 3n-skx"
 #  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
+#  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
@@ -5001,7 +5002,7 @@
 #- type: "table"
 #  title: "Detailed Test Results - VPP MRR Results 2n-skx"
 #  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
+#  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
@@ -5018,7 +5019,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 2n-clx"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/vpp_mrr_results_2n_clx"
+  output-file: "{DIR[DTR,MRR,VPP,2N,CLX]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5035,7 +5036,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-tsh"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/vpp_mrr_results_3n_tsh"
+  output-file: "{DIR[DTR,MRR,VPP,3N,TSH]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5052,7 +5053,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}/vpp_mrr_results_3n_dnv"
+  output-file: "{DIR[DTR,MRR,VPP,3N,DNV]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5069,7 +5070,7 @@
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 2n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
+  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5086,7 +5087,7 @@
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-hsw"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
+  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5103,7 +5104,7 @@
 #- type: "table"
 #  title: "Test configuration - VPP MRR Test Configs 3n-skx"
 #  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
+#  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
@@ -5120,7 +5121,7 @@
 #- type: "table"
 #  title: "Test configuration - VPP MRR Test Configs 2n-skx"
 #  algorithm: "table_merged_details"
-#  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
+#  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/"
 #  columns:
 #  - title: " |prein| Test Name |preout| "
 #    data: "data name"
@@ -5137,7 +5138,7 @@
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-clx"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}/vpp_mrr_test_configuration_2n_clx"
+  output-file: "{DIR[DTC,MRR,VPP,2N,CLX]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5154,7 +5155,7 @@
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-tsh"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/vpp_mrr_configuration_3n_tsh"
+  output-file: "{DIR[DTC,MRR,VPP,3N,TSH]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5171,7 +5172,7 @@
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}/vpp_mrr_test_configuration_3n_dnv"
+  output-file: "{DIR[DTC,MRR,VPP,3N,DNV]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5188,7 +5189,7 @@
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-dnv"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
+  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/"
   columns:
   - title: " |prein| Test Name |preout| "
     data: "data name"
@@ -5763,27 +5764,37 @@
   filter: "all"
   data-start-level: 4
   order-chapters:
-    - "l2"
-    - "ip4"
-    - "ip6"
-    - "srv6"
-    - "ip4_tunnels"
-    - "ip6_tunnels"
-    - "vm_vhost"
-    - "container_memif"
-    - "crypto"
-    - "vts"
-    - "lb"
-    - "nfv_density"
-    - "hoststack"
-  order-sub-chapters:
-    - "2n-skx"
-    - "3n-skx"
-    - "2n-clx"
-    - "3n-hsw"
-    - "3n-tsh"
-    - "2n-dnv"
-    - "3n-dnv"
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
 
 # VPP Performance Configuration
 - type: "file"
@@ -5809,27 +5820,37 @@
   filter: "all"
   data-start-level: 4
   order-chapters:
-    - "l2"
-    - "ip4"
-    - "ip6"
-    - "srv6"
-    - "ip4_tunnels"
-    - "ip6_tunnels"
-    - "vm_vhost"
-    - "container_memif"
-    - "crypto"
-    - "vts"
-    - "lb"
-    - "nfv_density"
-    - "hoststack"
-  order-sub-chapters:
-    - "2n-skx"
-    - "3n-skx"
-    - "2n-clx"
-    - "3n-hsw"
-    - "3n-tsh"
-    - "2n-dnv"
-    - "3n-dnv"
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
 
 # VPP Performance Operational
 - type: "file"
@@ -5855,27 +5876,37 @@
   filter: "all"
   data-start-level: 4
   order-chapters:
-    - "l2"
-    - "ip4"
-    - "ip6"
-    - "srv6"
-    - "ip4_tunnels"
-    - "ip6_tunnels"
-    - "vm_vhost"
-    - "container_memif"
-    - "crypto"
-    - "vts"
-    - "lb"
-    - "nfv_density"
-    - "hoststack"
-  order-sub-chapters:
-    - "2n-skx"
-    - "3n-skx"
-    - "2n-clx"
-    - "3n-hsw"
-    - "3n-tsh"
-    - "2n-dnv"
-    - "3n-dnv"
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
 
 # VPP MRR Results
 - type: "file"
@@ -5901,27 +5932,37 @@
   filter: "all"
   data-start-level: 4
   order-chapters:
-    - "l2"
-    - "ip4"
-    - "ip6"
-    - "srv6"
-    - "ip4_tunnels"
-    - "ip6_tunnels"
-    - "vm_vhost"
-    - "container_memif"
-    - "crypto"
-    - "vts"
-    - "lb"
-    - "nfv_density"
-    - "hoststack"
-  order-sub-chapters:
-    - "2n-skx"
-    - "3n-skx"
-    - "2n-clx"
-    - "3n-hsw"
-    - "3n-tsh"
-    - "2n-dnv"
-    - "3n-dnv"
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
 
 # VPP MRR Configuration
 - type: "file"
@@ -5947,27 +5988,37 @@
   filter: "all"
   data-start-level: 4
   order-chapters:
-    - "l2"
-    - "ip4"
-    - "ip6"
-    - "srv6"
-    - "ip4_tunnels"
-    - "ip6_tunnels"
-    - "vm_vhost"
-    - "container_memif"
-    - "crypto"
-    - "vts"
-    - "lb"
-    - "nfv_density"
-    - "hoststack"
-  order-sub-chapters:
-    - "2n-skx"
-    - "3n-skx"
-    - "2n-clx"
-    - "3n-hsw"
-    - "3n-tsh"
-    - "2n-dnv"
-    - "3n-dnv"
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
 
 # VPP Device Results - Ubuntu
 - type: "file"
@@ -15740,10 +15791,10 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-l2switching-base-scale-avf-ndr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-l2switching-base-scale-avf-ndr"
     layout: "plot-throughput"
@@ -15754,10 +15805,10 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-l2switching-base-scale-avf-pdr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-l2switching-base-scale-avf-pdr"
     layout: "plot-throughput"
@@ -16412,10 +16463,10 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-l2switching-base-scale-avf-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-l2switching-base-scale-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -16426,10 +16477,10 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-l2switching-base-scale-avf-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-l2switching-base-scale-avf-pdr"
     layout: "plot-throughput-speedup-analysis"