X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Freport%2Felements.yaml;h=7097a6e22f538082eaca639de9381a6af21a8976;hp=9188da34ea161fe2587f14f9380cd68d9ebf18fa;hb=fd11957f8ae43a892b5452b969dd08c316ecdd72;hpb=6e5cf8806c8c30bc58a5e6ad2e7dff1932c0d7d8

diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 9188da34ea..7097a6e22f 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -4,6 +4,126 @@
 
 # Statistics: job-specs' durations
 
+- type: "table"
+  title: "Job Specification Duration: 2n-icx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-icx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-2n-icx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-2n-icx-curr-iter"
+    - job-spec: "vpp-gso-mrr-00"
+      data-set: "vpp-2n-icx-curr-iter-gso"
+    - job-spec: "soak-00"
+      data-set: "vpp-2n-icx-curr-soak"
+    - job-spec: "nfv-density-mrr-00"
+      data-set: "vpp-2n-icx-curr-nfv-mrr"
+    - job-spec: "nfv-density-mlr-00"
+      data-set: "vpp-2n-icx-curr-nfv-ndrpdr"
+    - job-spec: "reconf-00"
+      data-set: "vpp-2n-icx-curr-nfv-reconf"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-2n-icx-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 2n-icx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-icx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-icx-curr-cov"
+#   lines:
+
+- type: "table"
+  title: "Job Specification Duration: 3n-icx-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-icx-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-icx-curr-iter"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-3n-icx-curr-iter"
+
+- type: "table"
+  title: "Job Specification Duration: 3n-icx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-icx-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-icx-curr-cov"
+  lines:
+    - job-spec: "crypto-00"
+      build: "35"
+    - job-spec: "crypto-01"
+      build: "36"
+    - job-spec: "crypto-02"
+      build: "37"
+    # - job-spec: "crypto-03"  # Completly failed
+    #   build: "68"
+    - job-spec: "crypto-04"
+      build: "38"
+    - job-spec: "ip4-00"
+      build: "39"
+    - job-spec: "ip4-01"
+      build: "40"
+    - job-spec: "ip4-02"
+      build: "41"
+    - job-spec: "ip4-03"
+      build: "42"
+    - job-spec: "ip4-04"
+      build: "43"
+    - job-spec: "ip4-05"
+      build: "44"
+    - job-spec: "ip4-06"
+      build: "45"
+    - job-spec: "ip4-07"
+      build: "46"
+    # - job-spec: "ip4tun-00"
+    #   build: "47"
+    - job-spec: "ip4tun-02"
+      build: "48"
+    - job-spec: "ip6-00"
+      build: "49"
+    - job-spec: "ip6-01"
+      build: "50"
+    - job-spec: "ip6tun-00"
+      build: "51"
+    - job-spec: "l2-00"
+      build: "52"
+    - job-spec: "l2-01"
+      build: "53"
+    # - job-spec: "l2-02"
+    #   build: "68"
+    - job-spec: "l2-03"
+      build: "55"
+    - job-spec: "l2-04"
+      build: "56"
+    - job-spec: "l2-05"
+      build: "57"
+    - job-spec: "l2-06"
+      build: "58"
+    - job-spec: "l2-07"
+      build: "59"
+    - job-spec: "l2-08"
+      build: "60"
+    - job-spec: "l2-09"
+      build: "61"
+    - job-spec: "l2-10"
+      build: "69"
+    # - job-spec: "memif-00"
+    #   build: "63"
+    - job-spec: "srv6-00"
+      build: "64"
+    - job-spec: "srv6-01"
+      build: "65"
+    - job-spec: "vhost-00"
+      build: "66"
+    - job-spec: "vhost-01"
+      build: "67"
+
 - type: "table"
   title: "Job Specification Duration: 2n-clx-iterative"
   algorithm: "table_job_spec_duration"
@@ -29,47 +149,47 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-2n-clx-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-clx-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-clx-curr-cov"
-#   lines:
-#     - job-spec: "gso-00"
-#       build: "18"
-#     - job-spec: "ip4-00"
-#       build: "19"
-#     - job-spec: "ip4-01"
-#       build: "20"
-#     - job-spec: "ip4-02"
-#       build: "21"
-#     - job-spec: "ip4-03"
-#       build: "22"
-#     - job-spec: "ip4-04"
-#       build: "23"
-#     - job-spec: "ip4-05"
-#       build: "24"
-#     - job-spec: "ip4-06"
-#       build: "25"
-#     - job-spec: "ip4-07"
-#       build: "26"
-#     - job-spec: "ip4tun-00"
-#       build: "27"
-#     - job-spec: "ip6-00"
-#       build: "28"
-#     - job-spec: "ip6-01"
-#       build: "29"
-#     - job-spec: "l2-00"
-#       build: "30"
-#     - job-spec: "l2-01"
-#       build: "31"
-#     - job-spec: "lb-00"
-#       build: "32"
-#     - job-spec: "memif-00"
-#       build: "33"
-#     - job-spec: "vhost-00"
-#       build: "34"
+- type: "table"
+  title: "Job Specification Duration: 2n-clx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-clx-curr-cov"
+  lines:
+    - job-spec: "gso-00"
+      build: "18"
+    - job-spec: "ip4-00"
+      build: "19"
+    - job-spec: "ip4-01"
+      build: "20"
+    - job-spec: "ip4-02"
+      build: "21"
+    - job-spec: "ip4-03"
+      build: "22"
+    - job-spec: "ip4-04"
+      build: "23"
+    - job-spec: "ip4-05"
+      build: "24"
+    - job-spec: "ip4-06"
+      build: "25"
+    - job-spec: "ip4-07"
+      build: "26"
+    - job-spec: "ip4tun-00"
+      build: "27"
+    - job-spec: "ip6-00"
+      build: "28"
+    - job-spec: "ip6-01"
+      build: "29"
+    - job-spec: "l2-00"
+      build: "30"
+    - job-spec: "l2-01"
+      build: "31"
+    - job-spec: "lb-00"
+      build: "32"
+    - job-spec: "memif-00"
+      build: "33"
+    - job-spec: "vhost-00"
+      build: "34"
 
 - type: "table"
   title: "Job Specification Duration: 2n-dnv-iterative"
@@ -82,25 +202,25 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-dnv-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-dnv-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-dnv-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "7"
-#     - job-spec: "ip4-01"
-#       build: "8"
-#     - job-spec: "ip6-00"
-#       build: "9"
-#     - job-spec: "ip6-01"
-#       build: "10"
-#     - job-spec: "l2-00"
-#       build: "11"
-#     - job-spec: "l2-01"
-#       build: "12"
+- type: "table"
+  title: "Job Specification Duration: 2n-dnv-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-dnv-curr-cov"
+  lines:
+    - job-spec: "ip4-00"
+      build: "7"
+    - job-spec: "ip4-01"
+      build: "8"
+    - job-spec: "ip6-00"
+      build: "14"
+    - job-spec: "ip6-01"
+      build: "10"
+    - job-spec: "l2-00"
+      build: "11"
+    - job-spec: "l2-01"
+      build: "12"
 
 - type: "table"
   title: "Job Specification Duration: 2n-aws-iterative"
@@ -113,15 +233,15 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-aws-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-aws-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-aws-curr-cov"
-#   lines:
-#     - job-spec: "vpp-00"
-#       build: "26"
+- type: "table"
+  title: "Job Specification Duration: 2n-aws-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-aws-curr-cov"
+  lines:
+    - job-spec: "vpp-00"
+      build: "1"
 
 - type: "table"
   title: "Job Specification Duration: 3n-aws-iterative"
@@ -134,15 +254,15 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-3n-aws-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-aws-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-aws-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-aws-curr-cov"
-#   lines:
-#     - job-spec: "vpp-00"
-#       build: "34"
+- type: "table"
+  title: "Job Specification Duration: 3n-aws-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-aws-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-aws-curr-cov"
+  lines:
+    - job-spec: "vpp-00"
+      build: "1"
 
 - type: "table"
   title: "Job Specification Duration: 2n-skx-iterative"
@@ -155,7 +275,7 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-skx-curr-iter"
     - job-spec: "vpp-gso-mrr-00"
-      data-set: "vpp-2n-skx-curr-gso"
+      data-set: "vpp-2n-skx-curr-iter-gso"
     - job-spec: "soak-00"
       data-set: "vpp-2n-skx-curr-soak"
     - job-spec: "nfv-density-mrr-00"
@@ -169,47 +289,47 @@
     - job-spec: "trex-mlr-00"
       data-set: "trex-2n-skx-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-skx-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-skx-curr-cov"
-#   lines:
-#     - job-spec: "gso-00"
-#       build: "18"
-#     - job-spec: "ip4-00"
-#       build: "19"
-#     - job-spec: "ip4-01"
-#       build: "20"
-#     - job-spec: "ip4-02"
-#       build: "21"
-#     - job-spec: "ip4-03"
-#       build: "22"
-#     - job-spec: "ip4-04"
-#       build: "23"
-#     - job-spec: "ip4-05"
-#       build: "24"
-#     - job-spec: "ip4-06"
-#       build: "25"
-#     - job-spec: "ip4-07"
-#       build: "26"
-#     - job-spec: "ip4tun-00"
-#       build: "27"
-#     - job-spec: "ip6-00"
-#       build: "28"
-#     - job-spec: "ip6-01"
-#       build: "29"
-#     - job-spec: "l2-00"
-#       build: "30"
-#     - job-spec: "l2-01"
-#       build: "31"
-#     - job-spec: "lb-00"
-#       build: "32"
-#     - job-spec: "memif-00"
-#       build: "33"
-#     - job-spec: "vhost-00"
-#       build: "34"
+- type: "table"
+  title: "Job Specification Duration: 2n-skx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-skx-curr-cov"
+  lines:
+    - job-spec: "gso-00"
+      build: "18"
+    - job-spec: "ip4-00"
+      build: "19"
+    - job-spec: "ip4-01"
+      build: "20"
+    - job-spec: "ip4-02"
+      build: "21"
+    - job-spec: "ip4-03"
+      build: "22"
+    - job-spec: "ip4-04"
+      build: "23"
+    - job-spec: "ip4-05"
+      build: "24"
+    - job-spec: "ip4-06"
+      build: "25"
+    - job-spec: "ip4-07"
+      build: "26"
+    - job-spec: "ip4tun-00"
+      build: "27"
+    - job-spec: "ip6-00"
+      build: "28"
+    - job-spec: "ip6-01"
+      build: "29"
+    - job-spec: "l2-00"
+      build: "30"
+    - job-spec: "l2-01"
+      build: "31"
+    - job-spec: "lb-00"
+      build: "32"
+    - job-spec: "memif-00"
+      build: "33"
+    - job-spec: "vhost-00"
+      build: "34"
 
 - type: "table"
   title: "Job Specification Duration: 2n-tx2-iterative"
@@ -222,41 +342,41 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-tx2-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-tx2-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-tx2-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
-#       build: "2"
-#     - job-spec: "ip4-02"
-#       build: "3"
-#     - job-spec: "ip4-03"
-#       build: "4"
-#     - job-spec: "ip4-04"
-#       build: "5"
-#     - job-spec: "ip4-05"
-#       build: "6"
-#     - job-spec: "ip4-06"
-#       build: "7"
-#     - job-spec: "ip6-00"
-#       build: "8"
-#     - job-spec: "ip6-01"
-#       build: "9"
-#     - job-spec: "l2-00"
-#       build: "10"
-#     - job-spec: "l2-01"
-#       build: "11"
-#     - job-spec: "l2-02"
-#       build: "12"
-#     - job-spec: "l2-03"
-#       build: "13"
-#     - job-spec: "l2-04"
-#       build: "14"
+- type: "table"
+  title: "Job Specification Duration: 2n-tx2-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-tx2-curr-cov"
+  lines:
+    - job-spec: "ip4-00"
+      build: "15"
+    - job-spec: "ip4-01"
+      build: "16"
+    - job-spec: "ip4-02"
+      build: "17"
+    - job-spec: "ip4-03"
+      build: "18"
+    - job-spec: "ip4-04"
+      build: "19"
+    - job-spec: "ip4-05"
+      build: "20"
+    - job-spec: "ip4-06"
+      build: "21"
+    - job-spec: "ip6-00"
+      build: "22"
+    - job-spec: "ip6-01"
+      build: "23"
+    - job-spec: "l2-00"
+      build: "24"
+    - job-spec: "l2-01"
+      build: "25"
+    - job-spec: "l2-02"
+      build: "26"
+    - job-spec: "l2-03"
+      build: "27"
+    - job-spec: "l2-04"
+      build: "28"
 
 - type: "table"
   title: "Job Specification Duration: 2n-zn2-iterative"
@@ -273,43 +393,43 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-2n-zn2-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-zn2-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-zn2-curr-cov"
-#   lines:
-#     - job-spec: "gso-00"
-#       build: "1"
+- type: "table"
+  title: "Job Specification Duration: 2n-zn2-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-zn2-curr-cov"
+  lines:
+    - job-spec: "gso-00"
+      build: "16"
 #     - job-spec: "ip4-00"
-#       build: "2"
-#     - job-spec: "ip4-01"
-#       build: "3"
-#     - job-spec: "ip4-02"
-#       build: "4"
-#     - job-spec: "ip4-03"
-#       build: "18"
-#     - job-spec: "ip4-04"
-#       build: "6"
-#     - job-spec: "ip4-05"
-#       build: "7"
-#     - job-spec: "ip4tun-00"
-#       build: "8"
+#       build: "17"
+    - job-spec: "ip4-01"
+      build: "18"
+    - job-spec: "ip4-02"
+      build: "19"
+    - job-spec: "ip4-03"
+      build: "20"
+    - job-spec: "ip4-04"
+      build: "21"
+    - job-spec: "ip4-05"
+      build: "22"
+    - job-spec: "ip4tun-00"
+      build: "23"
 #     - job-spec: "ip6-00"
-#       build: "9"
+#       build: "24"
 #     - job-spec: "ip6-01"
-#       build: "19"
-#     - job-spec: "l2-00"
-#       build: "11"
-#     - job-spec: "l2-01"
-#       build: "12"
+#       build: "25"
+    - job-spec: "l2-00"
+      build: "26"
+    - job-spec: "l2-01"
+      build: "27"
 #     - job-spec: "lb-00"
-#       build: "13"
-#     - job-spec: "memif-00"
-#       build: "14"
-#     - job-spec: "vhost-00"
-#       build: "15"
+#       build: "28"
+    - job-spec: "memif-00"
+      build: "29"
+    - job-spec: "vhost-00"
+      build: "30"
 
 - type: "table"
   title: "Job Specification Duration: 3n-dnv-iterative"
@@ -322,33 +442,33 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-3n-dnv-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-dnv-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-dnv-curr-cov"
-#   lines:
-#     - job-spec: "crypto-00"
-#       build: "12"
-#     - job-spec: "crypto-01"
-#       build: "13"
-#     - job-spec: "crypto-02"
-#       build: "14"
-#     - job-spec: "ip4-00"
-#       build: "15"
-#     - job-spec: "ip4-01"
-#       build: "16"
-#     - job-spec: "ip4tun-00"
-#       build: "17"
-#     - job-spec: "ip6-00"
-#       build: "18"
-#     - job-spec: "ip6-01"
-#       build: "19"
-#     - job-spec: "l2-00"
-#       build: "20"
-#     - job-spec: "l2-01"
-#       build: "21"
+- type: "table"
+  title: "Job Specification Duration: 3n-dnv-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-dnv-curr-cov"
+  lines:
+    - job-spec: "crypto-00"
+      build: "11"
+    - job-spec: "crypto-01"
+      build: "12"
+    - job-spec: "crypto-02"
+      build: "13"
+    - job-spec: "ip4-00"
+      build: "14"
+    - job-spec: "ip4-01"
+      build: "15"
+    - job-spec: "ip4tun-00"
+      build: "16"
+    - job-spec: "ip6-00"
+      build: "17"
+    - job-spec: "ip6-01"
+      build: "18"
+    - job-spec: "l2-00"
+      build: "19"
+    - job-spec: "l2-01"
+      build: "20"
 
 - type: "table"
   title: "Job Specification Duration: 3n-skx-iterative"
@@ -365,81 +485,81 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-3n-skx-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-skx-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-skx-curr-cov"
-#   lines:
-#     - job-spec: "crypto-00"
-#       build: "35"
-#     - job-spec: "crypto-01"
-#       build: "36"
-#     - job-spec: "crypto-02"
-#       build: "37"
-#     - job-spec: "crypto-03"  # Completly failed
-#       build: "38"
-#     - job-spec: "crypto-04"
-#       build: "39"
-#     - job-spec: "ip4-00"
-#       build: "40"
-#     - job-spec: "ip4-01"
-#       build: "41"
-#     - job-spec: "ip4-02"
-#       build: "42"
-#     - job-spec: "ip4-03"
-#       build: "43"
-#     - job-spec: "ip4-04"
-#       build: "44"
-#     - job-spec: "ip4-05"
-#       build: "45"
-#     - job-spec: "ip4-06"
-#       build: "46"
-#     - job-spec: "ip4-07"
-#       build: "47"
-#     - job-spec: "ip4tun-00"
-#       build: "48"
-#     - job-spec: "ip4tun-02"
-#       build: "49"
-#     - job-spec: "ip6-00"
-#       build: "50"
-#     - job-spec: "ip6-01"
-#       build: "51"
-#     - job-spec: "ip6tun-00"
-#       build: "52"
-#     - job-spec: "l2-00"
-#       build: "53"
-#     - job-spec: "l2-01"
-#       build: "54"
-#     - job-spec: "l2-02"
-#       build: "55"
-#     - job-spec: "l2-03"
-#       build: "56"
-#     - job-spec: "l2-04"
-#       build: "57"
-#     - job-spec: "l2-05"
-#       build: "58"
-#     - job-spec: "l2-06"
-#       build: "59"
-#     - job-spec: "l2-07"
-#       build: "60"
-#     - job-spec: "l2-08"
-#       build: "61"
-#     - job-spec: "l2-09"
-#       build: "62"
-#     - job-spec: "l2-10"
-#       build: "63"
-#     - job-spec: "memif-00"
-#       build: "64"
-#     - job-spec: "srv6-00"
-#       build: "65"
-#     - job-spec: "srv6-01"
-#       build: "66"
-#     - job-spec: "vhost-00"
-#       build: "67"
-#     - job-spec: "vhost-01"
-#       build: "68"
+- type: "table"
+  title: "Job Specification Duration: 3n-skx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-skx-curr-cov"
+  lines:
+    - job-spec: "crypto-00"
+      build: "35"
+    - job-spec: "crypto-01"
+      build: "36"
+    - job-spec: "crypto-02"
+      build: "37"
+    # - job-spec: "crypto-03"  # Completly failed
+    #   build: "68"
+    - job-spec: "crypto-04"
+      build: "38"
+    - job-spec: "ip4-00"
+      build: "39"
+    - job-spec: "ip4-01"
+      build: "40"
+    - job-spec: "ip4-02"
+      build: "41"
+    - job-spec: "ip4-03"
+      build: "42"
+    - job-spec: "ip4-04"
+      build: "43"
+    - job-spec: "ip4-05"
+      build: "44"
+    - job-spec: "ip4-06"
+      build: "45"
+    - job-spec: "ip4-07"
+      build: "46"
+    - job-spec: "ip4tun-00"
+      build: "47"
+    - job-spec: "ip4tun-02"
+      build: "48"
+    - job-spec: "ip6-00"
+      build: "49"
+    - job-spec: "ip6-01"
+      build: "50"
+    - job-spec: "ip6tun-00"
+      build: "51"
+    - job-spec: "l2-00"
+      build: "52"
+    - job-spec: "l2-01"
+      build: "53"
+    - job-spec: "l2-02"
+      build: "54"
+    - job-spec: "l2-03"
+      build: "55"
+    - job-spec: "l2-04"
+      build: "56"
+    - job-spec: "l2-05"
+      build: "57"
+    - job-spec: "l2-06"
+      build: "58"
+    - job-spec: "l2-07"
+      build: "59"
+    - job-spec: "l2-08"
+      build: "60"
+    - job-spec: "l2-09"
+      build: "61"
+    - job-spec: "l2-10"
+      build: "62"
+    - job-spec: "memif-00"
+      build: "63"
+    - job-spec: "srv6-00"
+      build: "64"
+    - job-spec: "srv6-01"
+      build: "65"
+    - job-spec: "vhost-00"
+      build: "66"
+    - job-spec: "vhost-01"
+      build: "67"
 
 - type: "table"
   title: "Job Specification Duration: 3n-tsh-iterative"
@@ -454,47 +574,47 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-3n-tsh-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-tsh-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-tsh-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
-#       build: "2"
-#     - job-spec: "ip4-02"
-#       build: "3"
-#     - job-spec: "ip4-03"
-#       build: "4"
-#     - job-spec: "ip4tun-00"
-#       build: "5"
-#     - job-spec: "ip6-00"
-#       build: "6"
-#     - job-spec: "ip6-01"
-#       build: "7"
-#     - job-spec: "l2-00"
-#       build: "8"
+- type: "table"
+  title: "Job Specification Duration: 3n-tsh-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-tsh-curr-cov"
+  lines:
+    - job-spec: "ip4-00"
+      build: "18"
+    - job-spec: "ip4-01"
+      build: "19"
+    - job-spec: "ip4-02"
+      build: "20"
+    - job-spec: "ip4-03"
+      build: "21"
+    - job-spec: "ip4tun-00"
+      build: "22"
+    - job-spec: "ip6-00"
+      build: "23"
+    - job-spec: "ip6-01"
+      build: "24"
+    - job-spec: "l2-00"
+      build: "25"
 #     - job-spec: "l2-01"
-#       build: "9"
+#       build: "26"
 #     - job-spec: "l2-02"
-#       build: "10"
-#     - job-spec: "l2-03"
-#       build: "11"
+#       build: "27"
+    - job-spec: "l2-03"
+      build: "28"
 #     - job-spec: "l2-04"
-#       build: "12"
-#     - job-spec: "memif-00"
-#       build: "13"
-#     - job-spec: "srv6-00"
-#       build: "14"
-#     - job-spec: "srv6-01"
-#       build: "15"
-#     - job-spec: "vhost-00"
-#       build: "16"
-#     - job-spec: "vhost-01"
-#       build: "17"
+#       build: "29"
+    - job-spec: "memif-00"
+      build: "30"
+    - job-spec: "srv6-00"
+      build: "31"
+    - job-spec: "srv6-01"
+      build: "32"
+    - job-spec: "vhost-00"
+      build: "33"
+    - job-spec: "vhost-01"
+      build: "34"
 
 # VPP Latency Changes 3n-skx 2t1c
 - type: "table"
@@ -1147,6 +1267,25 @@
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
 
+# VPP Soak vs NDR - 2n-icx
+- type: "table"
+  title: "VPP Soak vs NDR 2n-icx"
+  algorithm: "table_soak_vs_ndr"
+  output-file: "{DIR[STATIC,VPP]}/soak-vs-ndr-2n-icx"
+  reference:
+    title: "NDR"
+    data: "vpp-soak-vs-ndr-2n-icx-ref"
+  compare:
+    title: "Soak"
+    data: "vpp-2n-icx-curr-soak"
+  data: "vpp-soak-vs-ndr-2n-icx"
+  include-tests: "NDR"
+  filter: "'NDRPDR' or 'SOAK'"
+  parameters:
+    - "throughput"
+    - "name"
+    - "parent"
+
 # VPP Soak vs NDR - 2n-skx
 - type: "table"
   title: "VPP Soak vs NDR 2n-skx"
@@ -1512,6 +1651,52 @@
 ################################################################################
 # VPP
 
+# VPP Performance Changes 3n-skx Hoststack
+- type: "table"
+  title: "VPP Performance Changes 3n-skx Hoststack"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-hoststack"
+  include-tests: "hoststack"
+  filter: "all"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-3n-skx-prev-iter-hoststack-old-env"
+    - title: "2202.0-9"
+      data-set: "vpp-3n-skx-curr-iter-hoststack"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: Hoststack on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [Gbps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
+# VPP Performance Changes 2n-clx VSAP
+- type: "table"
+  title: "VPP Performance Changes 2n-clx VSAP"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-vsap"
+  include-tests: "vsap"
+  filter: "all"
+  columns:
+    - title: "2110.0-8"
+      data-set: "vpp-2n-clx-curr-iter-vsap-old-env"
+    - title: "2202.0-9"
+      data-set: "vpp-2n-clx-curr-iter-vsap"
+  comparisons:
+    - title: "2202.0-9 vs 2110.0-8"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: VSAP on 2n-clx with cx556a.'
+    - 'YYMM.V-E:             [cps|rps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+
 # VPP Performance Changes 3n-skx 2t1c pdr
 - type: "table"
   title: "VPP Performance Changes 3n-skx 2t1c pdr"
@@ -1538,7 +1723,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1569,7 +1754,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1600,7 +1785,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1631,7 +1816,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1662,7 +1847,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1693,7 +1878,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1724,7 +1909,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1755,7 +1940,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1786,7 +1971,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1817,7 +2002,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1848,7 +2033,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1879,7 +2064,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1910,7 +2095,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1941,7 +2126,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -1972,7 +2157,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2003,7 +2188,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2034,7 +2219,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2065,7 +2250,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2096,7 +2281,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2127,7 +2312,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2158,7 +2343,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2189,7 +2374,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2220,7 +2405,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2251,7 +2436,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2282,7 +2467,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2313,7 +2498,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2344,7 +2529,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2375,7 +2560,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2406,7 +2591,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2437,7 +2622,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2468,7 +2653,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2499,7 +2684,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2530,7 +2715,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2561,7 +2746,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2592,7 +2777,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2623,7 +2808,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -2647,7 +2832,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -2670,7 +2855,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -2693,7 +2878,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -2716,7 +2901,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -2739,7 +2924,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -2762,7 +2947,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -2785,7 +2970,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -2808,7 +2993,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -2902,22 +3087,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c ndr
 - type: "table"
@@ -2925,22 +3108,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 1c pdr
 - type: "table"
@@ -2948,22 +3129,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c pdr
 - type: "table"
@@ -2971,22 +3150,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c ndr
 - type: "table"
@@ -2994,22 +3171,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c ndr
 - type: "table"
@@ -3017,22 +3192,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c pdr
 - type: "table"
@@ -3040,22 +3213,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '1C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c pdr
 - type: "table"
@@ -3063,22 +3234,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'NDRPDR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'NDRPDR' and '2C'"
   columns:
     - title: "3n-skx xxv710"
       data-set: "vpp-3n-skx-curr-iter"
-      tag: "NIC_Intel-XXV710"
-    - title: "3n-icx e810cq"
+    - title: "3n-icx xxv710"
       data-set: "vpp-3n-icx-curr-iter"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "3n-skx xxv710, 3n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 3n-skx xxv710 and 3n-icx e810cq testbeds."
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 - type: "table"
@@ -3190,7 +3359,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3221,7 +3390,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3252,7 +3421,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3283,7 +3452,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3314,7 +3483,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3345,7 +3514,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3376,7 +3545,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3407,7 +3576,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3438,7 +3607,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3469,7 +3638,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3500,7 +3669,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3531,7 +3700,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with cx556a.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3562,7 +3731,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3593,7 +3762,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3624,7 +3793,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3655,7 +3824,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3686,7 +3855,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3717,7 +3886,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3748,7 +3917,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3779,7 +3948,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3810,7 +3979,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3841,7 +4010,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3872,7 +4041,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3903,7 +4072,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3934,7 +4103,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3965,7 +4134,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -3996,7 +4165,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2110.0-9 vs 2110.0-8: Compares CSIT environment current vs previous with previous VPP code.'
     - '2202.0-9 vs 2110.0-9: Compares VPP code current vs previous in the current CSIT environment.'
@@ -4020,7 +4189,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -4043,32 +4212,32 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
-# VPP Performance Changes 2n-aws 8t4c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-aws 8t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-8t4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C'"
-  columns:
-    - title: "2110.0-8"
-      data-set: "vpp-2n-aws-prev-iter-mrr"
-    - title: "2202.0-9"
-      data-set: "vpp-2n-aws-curr-iter-mrr"
-  comparisons:
-    - title: "2202.0-9 vs 2110.0-8"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 2n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+# # VPP Performance Changes 2n-aws 8t4c mrr
+# - type: "table"
+#   title: "VPP Performance Changes 2n-aws 8t4c mrr"
+#   algorithm: "table_comparison"
+#   output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-aws-8t4c-mrr"
+#   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#   filter: "'8T4C'"
+#   columns:
+#     - title: "2110.0-8"
+#       data-set: "vpp-2n-aws-prev-iter-mrr"
+#     - title: "2202.0-9"
+#       data-set: "vpp-2n-aws-curr-iter-mrr"
+#   comparisons:
+#     - title: "2202.0-9 vs 2110.0-8"
+#       reference: 1
+#       compare: 2
+#   legend:
+#     - ''
+#     - 'Test Case:            Test cases executed for: MRR throughput on 2n-aws with nitro50g.'
+#     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+#     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+#     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-aws 2t1c mrr
 - type: "table"
@@ -4089,7 +4258,7 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
@@ -4112,32 +4281,32 @@
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
-# VPP Performance Changes 3n-aws 8t4c mrr
-- type: "table"
-  title: "VPP Performance Changes 3n-aws 8t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-8t4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C'"
-  columns:
-    - title: "2110.0-8"
-      data-set: "vpp-3n-aws-prev-iter-mrr"
-    - title: "2202.0-9"
-      data-set: "vpp-3n-aws-curr-iter-mrr"
-  comparisons:
-    - title: "2202.0-9 vs 2110.0-8"
-      reference: 1
-      compare: 2
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
-    - 'YYMM.V-E:             [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
-    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
+# # VPP Performance Changes 3n-aws 8t4c mrr
+# - type: "table"
+#   title: "VPP Performance Changes 3n-aws 8t4c mrr"
+#   algorithm: "table_comparison"
+#   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-aws-8t4c-mrr"
+#   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#   filter: "'8T4C'"
+#   columns:
+#     - title: "2110.0-8"
+#       data-set: "vpp-3n-aws-prev-iter-mrr"
+#     - title: "2202.0-9"
+#       data-set: "vpp-3n-aws-curr-iter-mrr"
+#   comparisons:
+#     - title: "2202.0-9 vs 2110.0-8"
+#       reference: 1
+#       compare: 2
+#   legend:
+#     - ''
+#     - 'Test Case:            Test cases executed for: MRR throughput on 3n-aws with nitro50g.'
+#     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "8" for CSIT rls2110, "9" for CSIT rls2202).'
+#     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+#     - '2202.0-9 vs 2110.0-8: Compares VPP code current vs previous.'
 
 # VPP Comparison Across Testbeds 2n-skx to 2n-clx 2t1c mrr
 - type: "table"
@@ -4271,22 +4440,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-1c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '1C'"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '1C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter-mrr"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 2c mrr
 - type: "table"
@@ -4294,22 +4461,20 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-2c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '2C'"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '2C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter-mrr"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
 
 # VPP Comparison Across Testbeds 2n-clx to 2n-icx 4c mrr
 - type: "table"
@@ -4317,22 +4482,83 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-2n-clx-2n-icx-4c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "('NIC_Intel-XXV710' or 'NIC_Intel-E810CQ') and 'MRR' and '4C'"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '4C'"
   columns:
     - title: "2n-clx xxv710"
       data-set: "vpp-2n-clx-curr-iter-mrr"
-      tag: "NIC_Intel-XXV710"
-    - title: "2n-icx e810cq"
+    - title: "2n-icx xxv710"
       data-set: "vpp-2n-icx-curr-iter-mrr"
-      tag: "NIC_Intel-E810CQ"
   comparisons:
     - title: "Diff"
       reference: 1
       compare: 2
   legend:
     - ""
-    - "2n-clx xxv710, 2n-icx e810cq - testbeds and NICs tested."
-    - "Diff - difference between 2n-clx xxv710 and 2n-icx e810cq testbeds."
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '1C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '2C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# VPP Comparison Across Testbeds 3n-skx to 3n-icx 4c mrr
+- type: "table"
+  title: "VPP Comparison Across Testbeds 3n-skx to 3n-icx 4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-skx-3n-icx-4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710' and 'MRR' and '4C'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "vpp-3n-skx-curr-iter-mrr"
+    - title: "3n-icx xxv710"
+      data-set: "vpp-3n-icx-curr-iter-mrr"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
 
 # Detailed Test Results - VPP Performance Results 3n-skx
 - type: "table"
@@ -4415,7 +4641,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-2n-icx-curr-iter-best"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 #   remove-ndr: True
   parameters:
@@ -4433,7 +4659,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "vpp-3n-icx-curr-iter-best"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
   # remove-ndr: True
   parameters:
@@ -4621,7 +4847,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-2n-icx-curr-iter-best"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 #   remove-ndr: True
   parameters:
@@ -4639,7 +4865,7 @@
       data: "data name"
     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
       data: "data conf-history"
-  data: "vpp-3n-icx-curr-iter-best"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
   # remove-ndr: True
   parameters:
@@ -4786,7 +5012,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 2n-icx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,2N,ICX]}/"
-  data: "vpp-2n-icx-curr-iter-best"
+  data: "vpp-2n-icx-curr-cov"
   filter: "'NDRPDR'"
 
 # Test Operational Data - VPP Performance Operational Data 3n-icx
@@ -4794,7 +5020,7 @@
   title: "Test Operational Data - VPP Performance Operational Data 3n-icx"
   algorithm: "table_oper_data_html"
   output-file: "{DIR[DTO,PERF,VPP,3N,ICX]}/"
-  data: "vpp-3n-icx-curr-iter-best"
+  data: "vpp-3n-icx-curr-cov"
   filter: "'NDRPDR'"
 
 # Test Operational Data - VPP Performance Operational Data 3n-tsh
@@ -4930,22 +5156,22 @@
   - "parent"
   - "msg"
 
-# # Detailed Test Results - VPP MRR Results 3n-icx
-# - type: "table"
-#   title: "Detailed Test Results - VPP MRR Results 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,MRR,VPP,3N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
-#       data: "data msg"
-#   data: "vpp-mrr-results-3n-icx"
-#   filter: "'MRR'"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
+# Detailed Test Results - VPP MRR Results 3n-icx
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 3n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,3N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-3n-icx-curr-iter-mrr"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
 
 # Detailed Test Results - VPP MRR Results 3n-tsh
 - type: "table"
@@ -5134,22 +5360,22 @@
   - "name"
   - "conf-history"
 
-# # Test configuration - VPP MRR Test Configs 3n-icx
-# - type: "table"
-#   title: "Test configuration - VPP MRR Test Configs 3n-icx"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTC,MRR,VPP,3N,ICX]}/"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
-#       data: "data conf-history"
-#   data: "vpp-mrr-results-3n-icx"
-#   filter: "'MRR'"
-#   parameters:
-#   - "parent"
-#   - "name"
-#   - "conf-history"
+# Test configuration - VPP MRR Test Configs 3n-icx
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,3N,ICX]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-3n-icx-curr-iter-mrr"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
 
 # Test configuration - VPP MRR Test Configs 3n-tsh
 - type: "table"
@@ -5848,7 +6074,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X520'"
   columns:
     - title: "21.02"
       data-set: "dpdk-3n-tsh-hist-iter"
@@ -5871,7 +6097,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X520'"
   columns:
     - title: "21.02"
       data-set: "dpdk-3n-tsh-hist-iter"
@@ -5894,7 +6120,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X520'"
   columns:
     - title: "21.02"
       data-set: "dpdk-3n-tsh-hist-iter"
@@ -5917,7 +6143,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X520'"
   columns:
     - title: "21.02"
       data-set: "dpdk-3n-tsh-hist-iter"
@@ -6060,6 +6286,90 @@
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
+# DPDK Comparison Across Testbeds 2n-clx to 2n-icx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-clx to 2n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-clx-2n-icx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "dpdk-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 2n-clx to 2n-icx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-clx to 2n-icx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-clx-2n-icx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-clx xxv710"
+      data-set: "dpdk-2n-clx-curr-iter"
+    - title: "2n-icx xxv710"
+      data-set: "dpdk-2n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "2n-clx xxv710, 2n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 2n-clx xxv710 and 2n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 3n-skx to 3n-icx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-skx to 3n-icx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-skx-3n-icx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "dpdk-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
+# DPDK Comparison Across Testbeds 3n-skx to 3n-icx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-skx to 3n-icx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-skx-3n-icx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "3n-skx xxv710"
+      data-set: "dpdk-3n-skx-curr-iter"
+    - title: "3n-icx xxv710"
+      data-set: "dpdk-3n-icx-curr-iter"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - ""
+    - "3n-skx xxv710, 3n-icx xxv710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-skx xxv710 and 3n-icx xxv710 testbeds."
+
 # DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
 - type: "table"
   title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
@@ -6173,6 +6483,40 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,ICX]}/dpdk_performance_results_2n_icx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "dpdk-2n-icx-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-icx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,ICX]}/dpdk_performance_results_3n_icx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "dpdk-3n-icx-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 ## Detailed Test Results - DPDK Performance Results 2n-dnv
 #- type: "table"
 #  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
@@ -6285,8 +6629,8 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-    - "vpp-2n-icx-curr-iter-best"
-    - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -6358,8 +6702,8 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-    - "vpp-2n-icx-curr-iter-best"
-    - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -6431,8 +6775,8 @@
     - "vpp-2n-skx-curr-cov"
     - "vpp-3n-skx-curr-cov"
     - "vpp-2n-clx-curr-cov"
-    - "vpp-2n-icx-curr-iter-best"
-    - "vpp-3n-icx-curr-iter-best"
+    - "vpp-2n-icx-curr-cov"
+    - "vpp-3n-icx-curr-cov"
     - "vpp-2n-zn2-curr-cov"
     - "vpp-3n-tsh-curr-cov"
     - "vpp-2n-tx2-curr-cov"
@@ -6492,7 +6836,7 @@
     - "{DIR[DTR,MRR,VPP,3N,SKX]}"
     - "{DIR[DTR,MRR,VPP,2N,CLX]}"
     - "{DIR[DTR,MRR,VPP,2N,ICX]}"
-#     - "{DIR[DTR,MRR,VPP,3N,ICX]}"
+    - "{DIR[DTR,MRR,VPP,3N,ICX]}"
     - "{DIR[DTR,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTR,MRR,VPP,3N,TSH]}"
     - "{DIR[DTR,MRR,VPP,2N,TX2]}"
@@ -6505,7 +6849,7 @@
     - "vpp-3n-skx-curr-iter-mrr"
     - "vpp-2n-clx-curr-iter-mrr"
     - "vpp-2n-icx-curr-iter-mrr"
-#     - "vpp-mrr-results-3n-icx"
+    - "vpp-3n-icx-curr-iter-mrr"
     - "vpp-2n-zn2-curr-iter-mrr"
     - "vpp-3n-tsh-curr-iter-mrr"
     - "vpp-2n-tx2-curr-iter-mrr"
@@ -6535,7 +6879,7 @@
       - "3n-skx"
       - "2n-clx"
       - "2n-icx"
-#       - "3n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -6565,7 +6909,7 @@
     - "{DIR[DTC,MRR,VPP,3N,SKX]}"
     - "{DIR[DTC,MRR,VPP,2N,CLX]}"
     - "{DIR[DTC,MRR,VPP,2N,ICX]}"
-#     - "{DIR[DTC,MRR,VPP,3N,ICX]}"
+    - "{DIR[DTC,MRR,VPP,3N,ICX]}"
     - "{DIR[DTC,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTC,MRR,VPP,3N,TSH]}"
     - "{DIR[DTC,MRR,VPP,2N,TX2]}"
@@ -6578,7 +6922,7 @@
     - "vpp-3n-skx-curr-iter-mrr"
     - "vpp-2n-clx-curr-iter-mrr"
     - "vpp-2n-icx-curr-iter-mrr"
-#     - "vpp-mrr-results-3n-icx"
+    - "vpp-3n-icx-curr-iter-mrr"
     - "vpp-2n-zn2-curr-iter-mrr"
     - "vpp-3n-tsh-curr-iter-mrr"
     - "vpp-2n-tx2-curr-iter-mrr"
@@ -6608,7 +6952,7 @@
       - "3n-skx"
       - "2n-clx"
       - "2n-icx"
-#       - "3n-icx"
+      - "3n-icx"
       - "2n-zn2"
       - "3n-tsh"
       - "2n-tx2"
@@ -6688,6 +7032,26 @@
   filter: "all"
   data-start-level: 4
 
+# DPDK Performance Results 2n-icx
+- type: "file"
+  title: "DPDK Performance Results 2n-icx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,ICX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,ICX]}"
+  data: "dpdk-2n-icx-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 3n-icx
+- type: "file"
+  title: "DPDK Performance Results 3n-icx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,ICX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,ICX]}"
+  data: "dpdk-3n-icx-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
 ## DPDK Performance Results 2n-dnv
 #- type: "file"
 #  title: "DPDK Performance Results 2n-dnv"
@@ -6874,13 +7238,13 @@
 
 ################################################################################
 
-# Soak Test (PLRsearch), boxes - 2n-clx
+# Soak Test (PLRsearch), boxes - 2n-icx
 - type: "plot"
   title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
   algorithm: "plot_perf_box_name"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
-  data: "vpp-2n-clx-curr-soak"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-icx-1"
+  data: "vpp-2n-icx-curr-soak"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
@@ -6892,13 +7256,49 @@
     title: "30 Minutes Soak Test (PLRsearch)"
     layout: "plot-soak-throughput"
 
-# Soak Test (PLRsearch), boxes - 2n-clx
+# Soak Test (PLRsearch), boxes - 2n-icx
 - type: "plot"
   title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
   algorithm: "plot_perf_box_name"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
-  data: "vpp-2n-clx-curr-soak"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-icx-2"
+  data: "vpp-2n-icx-curr-soak"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-soak"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-soak"
+  layout:
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
+# Soak Test (PLRsearch), boxes - 2n-clx
+- type: "plot"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  algorithm: "plot_perf_box_name"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
+  data: "vpp-2n-clx-curr-soak"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
+  layout:
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
+# Soak Test (PLRsearch), boxes - 2n-clx
+- type: "plot"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  algorithm: "plot_perf_box_name"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
+  data: "vpp-2n-clx-curr-soak"
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
     - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
@@ -6948,6 +7348,27 @@
 
 ###############################################################################
 
+# Reconf tests 2n-icx
+
+- type: "plot"
+  title: "NFV Effective Blocked Time: 2n-icx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-imix-{core}-dot1qip4vxlan-l2bd-reconf"
+  data: "vpp-2n-icx-curr-nfv-reconf"
+  core: ["2t1c", "4t2c", "8t4c"]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-{core}-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
+  layout:
+    title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
+    layout: "plot-throughput"
+
+###############################################################################
+
 # Reconf tests 2n-skx
 
 - type: "plot"
@@ -6988,6 +7409,192 @@
 
 ###############################################################################
 
+# Plots - NF Density - 2n-icx - VSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
+  algorithm: "plot_nf_heatmap"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-icx-xxv710-imix-{core}-base-vsc-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-mrr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  test-type: ["mrr", ]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-mrr"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - VSC - NDRPDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
+  algorithm: "plot_nf_heatmap"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-icx-xxv710-imix-{core}-base-vsc-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-ndrpdr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Vh-1Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Vh-2Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Vh-4Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Vh-6Vm1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - VSC vxlan - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
+  algorithm: "plot_nf_heatmap"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-icx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-mrr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  test-type: ["mrr", ]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-Mrr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-mrr"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - VSC vxlan - NDRPDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-{test_type}"
+  algorithm: "plot_nf_heatmap"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-icx-xxv710-imix-{core}-base-vsc-vxlan-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-ndrpdr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-2Vh-1Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-4Vh-2Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-8Vh-4Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-12Vh-6Vm1T-Testpmd-ndrpdr.IMIX-{core}-avf-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-test_type"
+    layout: "plot-service-density"
+
+###############################################################################
+
+# Plots - NF Density - 2n-icx - CSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
+  algorithm: "plot_nf_heatmap"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-icx-xxv710-imix-{core}-base-csc-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-mrr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  test-type: ["mrr", ]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-mrr"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - CSC - NDRPDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-{test_type}"
+  algorithm: "plot_nf_heatmap"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-icx-xxv710-imix-{core}-base-csc-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-ndrpdr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-4Ch-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Chain.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Ch-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
+
+###############################################################################
+
+# Plots - NF Density - 2n-icx - CSP - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
+  algorithm: "plot_nf_heatmap"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-icx-xxv710-imix-{core}-base-csp-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-mrr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  test-type: ["mrr", ]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-mrr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-Mrr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-mrr"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
+
+# Plots - NF Density - 2n-icx - CSP - NDRPDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-{test_type}"
+  algorithm: "plot_nf_heatmap"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-icx-xxv710-imix-{core}-base-csp-{test_type}"
+  data: "vpp-2n-icx-curr-nfv-ndrpdr"
+  core: ["2t1c", "4t2c", "8t4c"]
+  include:
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-1Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-1Pl-2Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-2Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-4Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-2Pl-8Mif-4Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr"
+    - "Tests.Vpp.Perf.Nfv Density.Dcr Memif.Pipeline.2N-25Ge2P1Xxv710-Avf-Eth-L2Bd-6Pl-12Mif-6Dcr1T-Vppip4-ndrpdr.IMIX-{core}-avf-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean {test_type}) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-test_type"
+    layout: "plot-service-density"
+
+###############################################################################
+
 # Plots - NF Density - 2n-skx - VSC - MRR IMIX
 - type: "plot"
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-{test_type}"
@@ -8388,9 +8995,9 @@
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
     title: "3n-skx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput"
@@ -11179,553 +11786,619 @@
 # 2n-icx
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-memif-base-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-memif-base-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-memif-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-memif-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-memif-base-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-memif-base-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-{core}-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-memif-base-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-{core}-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-{core}-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Base-ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-ip4routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ip4routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-features-ip4routing-base-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-features-ip4routing-base-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-features-ip4routing-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-features-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput"
 
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-Ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#     layout: "plot-throughput"
-#
-# - type: "plot"
-#   title: "Throughput: 2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#   data: "vpp-2n-icx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-ndrpdr.64B-{core}-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
+    layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-ndrpdr.64B-{core}-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-ethip4--ethip4udpgeneve-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-{core}-avf-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-ndrpdr.78B-{core}-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-ndrpdr.78B-{core}-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-{core}-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Base-ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-78b-{core}-ip6routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-vhost-base-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-vhost-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-{core}-avf-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-vhost-base-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-l2switching-base-scale-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-{core}-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-{core}-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-{core}-vhost-base-vpp-{test_type}"
+    title: "2n-icx-xxv710-64b-{core}-l2switching-base-scale-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-memif-base-avf-{test_type}-tsa"
+  title: "Throughput: 2n-icx-xxv710-64b-{core}-vhost-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-{core}-vhost-base-{test_type}"
+  data: "vpp-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-vhost-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-memif-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-memif-base-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-memif-base-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-memif-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-memif-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-memif-base-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-memif-base-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-.t.c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-memif-base-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-avf-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip4routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Base-ndrpdr.64B-.t.c-af-xdp-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip4-Ip4Scale20K-Rnd-ndrpdr.64B-.t.c-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-features-ip4routing-base-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ip4routing-base-scale-af_xdp-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip4routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-features-ip4routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-Ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
-#
-# - type: "plot"
-#   title: "Speedup: 2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-#   algorithm: "plot_tsa_name"
-#   output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
-#   data: "vpp-2n-icx-curr-iter"
-#   include:
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
-#     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1E810Cq-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
-#   layout:
-#     title: "2n-icx-e810cq-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
-#     layout: "plot-throughput-speedup-analysis"
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H1024-P63-S64512-ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H16384-P63-S1032192-ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Det-H65536-P63-S4128758-ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Udir-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-100Ge2P1E810Cq-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Avf-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip6routing-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale200K-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-ip6routing-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-l2switching-base-scale-avf-{test_type}"
+    title: "2n-icx-xxv710-64b-ethip4--ethip4udpgeneve-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-l2switching-base-scale-dpdk-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-vhost-base-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-vhost-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-dpdk-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-Rnd-ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-vhost-base-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-icx-e810cq-64b-vhost-base-vpp-{test_type}-tsa"
+  title: "Speedup: 2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-icx-e810cq-64b-vhost-base-vpp-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-78b-ip6routing-base-scale-af_xdp-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Base-ndrpdr.78B-.t.c-af-xdp-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Af-Xdp-Ethip6-Ip6Scale20K-Rnd-ndrpdr.78B-.t.c-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
   layout:
-    title: "2n-icx-e810cq-64b-vhost-base-vpp-{test_type}"
+    title: "2n-icx-xxv710-64b-ip6routing-base-scale-af_xdp-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-l2switching-base-scale-avf-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-.t.c-avf-eth-l2xcbase-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-icx-xxv710-64b-l2switching-base-scale-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale10Kmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-l2switching-base-scale-dpdk-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-vhost-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-64b-vhost-base-{test_type}-tsa"
+  data: "vpp-2n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-.t.c-avf-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-vhost-base-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 # Packet Throughput - DPDK
 
+# 2n-icx
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-icx-xxv710-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-icx-xxv710-64b-{core}-base-{test_type}"
+  data: "dpdk-2n-icx-curr-iter"
+  core: ["2t1c", "4t2c"]
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 2n-icx-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-icx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-2n-icx-curr-iter"
+  include:
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-icx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+# 3n-icx
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-icx-xxv710-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-icx-xxv710-64b-{core}-base-{test_type}"
+  data: "dpdk-3n-icx-curr-iter"
+  core: ["2t1c", "4t2c"]
+  include:
+    - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-icx-xxv710-64b-base-{test_type}-tsa"
+  data: "dpdk-3n-icx-curr-iter"
+  include:
+    - "tests.dpdk.perf.25ge2p1xxv710-eth-l2xcbase-testpmd-ndrpdr.64b-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.25ge2p1xxv710-ethip4-ip4base-l3fwd-ndrpdr.64b-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 # 2n-clx
 
 - type: "plot"
@@ -12838,284 +13511,434 @@
 # 3n-icx Throughput
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-1518b-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-{core}-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-ip4routing-base-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-ip4tunnel-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-avf-ethip4gtpusw-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-{core}-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-imix-{core}-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-{core}-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-{core}-ip6routing-base-{test_type}"
+    title: "3n-icx-xxv710-64b-{core}-ip4routing-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-{core}-l2switching-base-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-{core}-avf-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-{core}-avf-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-{core}-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-{core}-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-icx-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  title: "Throughput: 3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
   data: "vpp-3n-icx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-{core}-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-{core}-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+    title: "3n-icx-xxv710-78b-{core}-ip6routing-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-{core}-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-{core}-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-{core}-l2switching-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-ndrpdr.78B-{core}-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-ndrpdr.78B-{core}-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-78b-{core}-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput"
 
 # 3n-icx Speedup
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.1518B-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-imix-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-1518b-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.1518B-.t.c-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-avf-{test_type}"
+    title: "3n-icx-xxv710-1518b-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.100Ge2P1E810Cq-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-1518b-ipsec-ip4routing-base-scale-dpdk-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-aes128cbc-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4routing-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4routing-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Avf-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.100Ge2P1E810Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-ip4routing-base-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-aes256gcm-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-ip4tunnel-base-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-ip4tunnel-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Avf-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4gtpusw-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4 Tunnels.100Ge2P1E810Cq-Ethip4Gtpusw-Ip4Base-Ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-ndrpdr.imix-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Avf-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-avf-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-ip4tunnel-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-78b-ip6routing-base-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-ip6routing-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.100Ge2P1E810Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec40Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-ip6routing-base-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-64b-l2switching-base-[avf,dpdk]-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-64b-l2switching-base-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.100Ge2P1E810Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec8Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-ndrpdr.imix-.t.c-ethip4ipsec8tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-64b-l2switching-base-[avf,dpdk]-{test_type}"
+    title: "3n-icx-xxv710-imix-ipsec-scheduler-ip4routing-base-scale-sw-dpdk-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  title: "Speedup: 3n-icx-xxv710-64b-ip4routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-ip4routing-base-{test_type}-tsa"
   data: "vpp-3n-icx-curr-iter"
   include:
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.100Ge2P1E810Cq-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Base-ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
   layout:
-    title: "3n-icx-e810cq-78b-srv6-ip6routing-base-avf-{test_type}"
+    title: "3n-icx-xxv710-64b-ip4routing-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-ip4tunnel-base-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-.t.c-avf-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-.t.c-avf-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Gtpusw-Ip4Base-ndrpdr.64B-.t.c-ethip4gtpusw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Vxlan-L2Xcbase-ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-ip4tunnel-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1Xxv710-Ethip6-Ip6Base-ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-78b-ip6routing-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-64b-l2switching-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-64b-l2switching-base-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Patch-ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Patch-ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Xcbase-ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-64b-l2switching-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-ndrpdr.78B-.t.c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-ndrpdr.78B-.t.c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
 ################################################################################
@@ -13193,7 +14016,7 @@
   output-file-links: "{DIR[LAT,VPP]}/2n_icx.rst"
   target-links: "../../_static/vpp"
   data: "vpp-2n-icx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710' and 'NDRPDR'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -13204,7 +14027,7 @@
   output-file-links: "{DIR[LAT,VPP]}/3n_icx.rst"
   target-links: "../../_static/vpp"
   data: "vpp-3n-icx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-E810CQ' and 'NDRPDR'"
+  filter: "'2T1C' and 'NIC_Intel-XXV710' and 'NDRPDR'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -13252,6 +14075,28 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
+- type: "plot"
+  title: "Latency by percentile: DPDK 2n-icx"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-icx"
+  output-file-links: "{DIR[LAT,DPDK]}/2n_icx.rst"
+  target-links: "../../_static/dpdk"
+  data: "dpdk-2n-icx-curr-iter-best"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: DPDK 3n-icx"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-icx"
+  output-file-links: "{DIR[LAT,DPDK]}/3n_icx.rst"
+  target-links: "../../_static/dpdk"
+  data: "dpdk-3n-icx-curr-iter-best"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
 - type: "plot"
   title: "Latency by percentile: DPDK 2n-skx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
@@ -13322,11 +14167,26 @@
 
 # GSO
 
+- type: "plot"
+  title: "Throughput: 2n-icx-128kb-{core}-ip4routing-iperf3"
+  algorithm: "plot_mrr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-icx-128kb-{core}-ip4routing-iperf3"
+  data: "vpp-2n-icx-curr-iter-gso"
+  core: ["1t1c", "2t2c", "4t4c"]
+  include:
+    - "Tests.Vpp.Perf.Gso.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"
+    - "Tests.Vpp.Perf.Gso.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-2Tap-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-iperf3-mrr"
+    - "Tests.Vpp.Perf.Gso.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-2Vhost-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-gso-iperf3-mrr"
+    - "Tests.Vpp.Perf.Gso.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-2Vhost-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2vhost-iperf3-mrr"
+  layout:
+    title: "2n-icx-128kb-{core}-ip4routing-iperf3"
+    layout: "plot-throughput-gbps"
+
 - type: "plot"
   title: "Throughput: 2n-skx-128kb-{core}-ip4routing-iperf3"
   algorithm: "plot_mrr_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-128kb-{core}-ip4routing-iperf3"
-  data: "vpp-2n-skx-curr-gso"
+  data: "vpp-2n-skx-curr-iter-gso"
   core: ["1t1c", "2t2c", "4t4c"]
   include:
     - "Tests.Vpp.Perf.Gso.2N1L-10Ge2P1X710-Ethip4-Ip4Base-2Tap-Gso-Iperf3-Mrr.128KB-{core}-ethip4-ip4base-2tap-gso-iperf3-mrr"