Report: Add wireguard tests

[csit.git] / resources / tools / presentation / specifications / report / elements.yaml

diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 6a9d8ec..d2dbe7d 100644 (file)
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -26,6 +26,8 @@
       data-set: "vpp-2n-icx-curr-nfv-reconf"
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-2n-icx-curr-iter"
+    - job-spec: "trex-mlr-00"
+      data-set: "trex-2n-icx-curr-iter"
 
 # - type: "table"
 #   title: "Job Specification Duration: 2n-icx-coverage"
@@ -79,6 +81,8 @@
       data-set: "vpp-3n-icx-curr-iter-mrr"
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-3n-icx-curr-iter"
+    - job-spec: "hoststack-00"
+      data-set: "vpp-3n-icx-curr-iter-hoststack"
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-3n-icx-curr-iter"
 
@@ -174,8 +178,6 @@
       data-set: "vpp-2n-clx-curr-iter-gso"
     - job-spec: "soak-00"
       data-set: "vpp-2n-clx-curr-soak"
-    - job-spec: "vsap-00"
-      data-set: "vpp-2n-clx-curr-iter-vsap"
     - job-spec: "nfv-density-mrr-00"
       data-set: "vpp-2n-clx-curr-nfv-mrr"
     - job-spec: "nfv-density-mlr-00"
@@ -418,6 +420,47 @@
 #     - job-spec: "l2-01"
 #       build: "10"
 
+- type: "table"
+  title: "Job Specification Duration: 3n-snr-iterative"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-snr-iter"
+  jb-type: "iterative"
+  lines:
+    - job-spec: "vpp-mrr-00"
+      data-set: "vpp-3n-snr-curr-iter-mrr"
+    - job-spec: "vpp-mlr-00"
+      data-set: "vpp-3n-snr-curr-iter"
+    - job-spec: "dpdk-mlr-00"
+      data-set: "dpdk-3n-snr-curr-iter"
+
+# - type: "table"
+#   title: "Job Specification Duration: 3n-snr-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-snr-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-snr-curr-cov"
+#   lines:
+#     - job-spec: "crypto-00"
+#       build: "1"
+#     - job-spec: "crypto-01"
+#       build: "2"
+#     - job-spec: "crypto-02"
+#       build: "3"
+#     - job-spec: "ip4-00"
+#       build: "4"
+#     - job-spec: "ip4-01"
+#       build: "5"
+#     - job-spec: "ip4tun-00"
+#       build: "6"
+#     - job-spec: "ip6-00"
+#       build: "7"
+#     - job-spec: "ip6-01"
+#       build: "8"
+#     - job-spec: "l2-00"
+#       build: "9"
+#     - job-spec: "l2-01"
+#       build: "10"
+
 - type: "table"
   title: "Job Specification Duration: 3n-tsh-iterative"
   algorithm: "table_job_spec_duration"
@@ -789,27 +832,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -820,27 +867,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -851,27 +902,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -882,27 +937,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -913,27 +972,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-clx 2t1c
 - type: "table"
@@ -944,27 +1007,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -975,27 +1042,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -1006,27 +1077,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-zn2 2t1c
 - type: "table"
@@ -1037,27 +1112,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -1068,27 +1147,31 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -1099,27 +1182,31 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-tx2 1t1c
 - type: "table"
@@ -1130,27 +1217,31 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 3n-tsh 1t1c
 - type: "table"
@@ -1161,27 +1252,31 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 3n-tsh 1t1c
 - type: "table"
@@ -1192,27 +1287,31 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 3n-tsh 1t1c
 - type: "table"
@@ -1223,27 +1322,31 @@
   filter: "'1T1C' and 'NDRPDR'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 3n-icx 2t1c
 - type: "table"
@@ -1254,27 +1357,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 3n-icx 2t1c
 - type: "table"
@@ -1285,27 +1392,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 3n-icx 2t1c
 - type: "table"
@@ -1316,27 +1427,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-icx 2t1c
 - type: "table"
@@ -1347,27 +1462,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-icx 2t1c
 - type: "table"
@@ -1378,27 +1497,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Latency Changes 2n-icx 2t1c
 - type: "table"
@@ -1409,27 +1532,136 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Latency Changes 3n-alt 1t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-alt 1t1c PDR50-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-alt-xl710-1t1c-pdr50-d1-avg"
+  include-tests: "latency-PDR50-direction1-avg"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Latency Changes 3n-alt 1t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-alt 1t1c PDR90-direction1-avg"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-alt-xl710-1t1c-pdr90-d1-avg"
+  include-tests: "latency-PDR90-direction1-avg"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Latency Changes 3n-alt 1t1c
+- type: "table"
+  title: "VPP Latency Changes 3n-alt 1t1c PDR90-direction1-max"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/latency-changes-3n-alt-xl710-1t1c-pdr90-d1-max"
+  include-tests: "latency-PDR90-direction1-max"
+  filter: "'1T1C' and 'NDRPDR'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter""
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Soak vs NDR - 2n-icx
 - type: "table"
@@ -1474,30 +1706,30 @@
 ################################################################################
 # VPP
 
-# 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: "2202.0-9"
-      data-set: "vpp-2n-clx-hist-iter-vsap-new-env"
-    - title: "2206.0-10"
-      data-set: "vpp-2n-clx-curr-iter-vsap-old-env"
-    - title: "2210.0-11"
-      data-set: "vpp-2n-clx-curr-iter-vsap"
-  comparisons:
-    - title: "2210.0-11 vs 2206.0-10"
-      reference: 2
-      compare: 3
-  legend:
-    - ''
-    - 'Test Case:              Test cases executed for: VSAP 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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
-    - '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.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous.'
+# # VPP Performance Changes 3n-icx Hoststack
+# - type: "table"
+#   title: "VPP Performance Changes 3n-icx Hoststack"
+#   algorithm: "table_comparison"
+#   output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-icx-hoststack"
+#   include-tests: "hoststack"
+#   filter: "all"
+#   columns:
+#     - title: "2110.0-8"
+#       data-set: "vpp-3n-icx-hist-iter-hoststack-new-env"
+#     - title: "2202.0-9"
+#       data-set: "vpp-3n-icx-prev-iter-hoststack-old-env"
+#     - title: "2206.0-10"
+#       data-set: "vpp-3n-icx-curr-iter-hoststack"
+#   comparisons:
+#     - title: "2206.0-10 vs 2202.0-9"
+#       reference: 2
+#       compare: 3
+#   legend:
+#     - ''
+#     - 'Test Case:             Test cases executed for: Hoststack on 3n-icx with e810xxv.'
+#     - 'YYMM.V-E:              [Mbps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "9" for CSIT rls2202, "10" for CSIT rls2210).'
+#     - '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.'
+#     - '2206.0-10 vs 2202.0-9: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-icx 2t1c pdr
 - type: "table"
@@ -1508,27 +1740,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-icx 4t2c pdr
 - type: "table"
@@ -1539,27 +1775,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-icx 2t1c ndr
 - type: "table"
@@ -1570,27 +1810,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: NDR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-icx 4t2c ndr
 - type: "table"
@@ -1601,27 +1845,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-new-env"
+      data-set: "vpp-3n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: NDR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-icx 2t1c pdr
 - type: "table"
@@ -1632,27 +1880,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-icx 4t2c pdr
 - type: "table"
@@ -1663,27 +1915,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: PDR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-icx 2t1c ndr
 - type: "table"
@@ -1694,27 +1950,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: NDR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-icx 4t2c ndr
 - type: "table"
@@ -1725,27 +1985,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-new-env"
+      data-set: "vpp-2n-icx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: NDR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
@@ -1756,27 +2020,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
@@ -1787,27 +2055,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
@@ -1818,27 +2090,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
@@ -1849,27 +2125,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c pdr
 - type: "table"
@@ -1880,27 +2160,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c pdr
 - type: "table"
@@ -1911,27 +2195,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c ndr
 - type: "table"
@@ -1942,27 +2230,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c ndr
 - type: "table"
@@ -1973,27 +2265,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-new-env"
+      data-set: "vpp-2n-clx-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c pdr
 - type: "table"
@@ -2004,27 +2300,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c pdr
 - type: "table"
@@ -2035,27 +2335,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c ndr
 - type: "table"
@@ -2066,27 +2370,31 @@
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c ndr
 - type: "table"
@@ -2097,27 +2405,31 @@
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-new-env"
+      data-set: "vpp-2n-zn2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
@@ -2128,27 +2440,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-new-env"
+      data-set: "vpp-2n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-dnv-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-dnv-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
@@ -2159,27 +2475,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-new-env"
+      data-set: "vpp-2n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-dnv-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-dnv-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
@@ -2190,27 +2510,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-new-env"
+      data-set: "vpp-2n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-dnv-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-dnv-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
@@ -2221,27 +2545,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-new-env"
+      data-set: "vpp-2n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-dnv-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-dnv-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-dnv-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
@@ -2252,27 +2580,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-new-env"
+      data-set: "vpp-3n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-dnv-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-dnv-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
@@ -2283,27 +2615,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-new-env"
+      data-set: "vpp-3n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-dnv-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-dnv-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
@@ -2314,27 +2650,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-new-env"
+      data-set: "vpp-3n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-dnv-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-dnv-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
@@ -2345,27 +2685,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-new-env"
+      data-set: "vpp-3n-dnv-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-dnv-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-dnv-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-dnv-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -2376,27 +2720,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -2407,27 +2755,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -2438,27 +2790,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -2469,27 +2825,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-new-env"
+      data-set: "vpp-3n-tsh-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c pdr
 - type: "table"
@@ -2500,27 +2860,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c pdr
 - type: "table"
@@ -2531,27 +2895,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c ndr
 - type: "table"
@@ -2562,27 +2930,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c ndr
 - type: "table"
@@ -2593,27 +2965,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-new-env"
+      data-set: "vpp-2n-tx2-hist-iter"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-aws 2t1c pdr
 - type: "table"
@@ -2715,6 +3091,146 @@
     - '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.'
     - '2210.0-11 vs 2206.0-10: Compares VPP code current vs previous.'
 
+# VPP Performance Changes 3n-alt 1t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-alt 1t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-alt-1t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-alt 2t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-alt 2t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-alt-2t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: PDR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-alt 1t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-alt 1t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-alt-1t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-alt 2t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-alt 2t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-alt-2t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: NDR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
 # VPP Performance Changes 3n-icx 2t1c mrr
 - type: "table"
   title: "VPP Performance Changes 3n-icx 2t1c mrr"
@@ -2724,27 +3240,31 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-icx 4t2c mrr
 - type: "table"
@@ -2755,27 +3275,31 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-icx 8t4c mrr
 - type: "table"
@@ -2786,27 +3310,31 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-icx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-icx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-icx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: MRR throughput on 3n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-icx 2t1c mrr
 - type: "table"
@@ -2817,27 +3345,31 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: MRR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-icx 4t2c mrr
 - type: "table"
@@ -2848,27 +3380,31 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: MRR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-icx 8t4c mrr
 - type: "table"
@@ -2879,27 +3415,31 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-icx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-icx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-icx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-icx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-icx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   legend:
     - ''
     - 'Test Case:              Test cases executed for: MRR throughput on 2n-icx with xxv710.'
     - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
@@ -2910,27 +3450,31 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
@@ -2941,27 +3485,31 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
@@ -2972,27 +3520,31 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 2t1c mrr
 - type: "table"
@@ -3003,27 +3555,31 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 4t2c mrr
 - type: "table"
@@ -3034,27 +3590,31 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-clx-cx556a 8t4c mrr
 - type: "table"
@@ -3065,27 +3625,31 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Mellanox-CX556A'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-clx-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-clx-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-clx-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-clx-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-clx-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 2t1c mrr
 - type: "table"
@@ -3096,27 +3660,31 @@
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-zn2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 4t2c mrr
 - type: "table"
@@ -3127,27 +3695,31 @@
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-zn2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-zn2-xxv710 8t4c mrr
 - type: "table"
@@ -3158,27 +3730,31 @@
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-zn2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-zn2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-zn2-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-zn2-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-zn2-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c mrr
 - type: "table"
@@ -3189,27 +3765,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
@@ -3220,27 +3800,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
@@ -3251,27 +3835,31 @@
   filter: "'4T4C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-dnv-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-dnv-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
@@ -3282,27 +3870,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
@@ -3313,27 +3905,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
@@ -3344,27 +3940,31 @@
   filter: "'4T4C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-dnv-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-dnv-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-dnv-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-dnv-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-dnv-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
@@ -3375,27 +3975,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-tsh-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
@@ -3406,27 +4010,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-tsh-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
@@ -3437,27 +4045,31 @@
   filter: "'4T4C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-3n-tsh-hist-iter-mrr-new-env"
+      data-set: "vpp-3n-tsh-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-3n-tsh-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-tsh-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-3n-tsh-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 1t1c mrr
 - type: "table"
@@ -3468,27 +4080,31 @@
   filter: "'1T1C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 2t2c mrr
 - type: "table"
@@ -3499,27 +4115,31 @@
   filter: "'2T2C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-tx2 4t4c mrr
 - type: "table"
@@ -3530,27 +4150,31 @@
   filter: "'4T4C'"
   columns:
     - title: "2202.0-10"
-      data-set: "vpp-2n-tx2-hist-iter-mrr-new-env"
+      data-set: "vpp-2n-tx2-hist-iter-mrr"
     - title: "2206.0-10"
       data-set: "vpp-2n-tx2-prev-iter-mrr-old-env"
-    - title: "2206.0-11"
-      data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-2n-tx2-prev-iter-mrr-new-env"
     - title: "2210.0-11"
       data-set: "vpp-2n-tx2-curr-iter-mrr"
   comparisons:
-    - title: "2206.0-11 vs 2206.0-10"
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
       reference: 2
       compare: 3
-    - title: "2210.0-11 vs 2206.0-11"
-      reference: 3
-      compare: 4
   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, "10" for CSIT rls2206, "11" for CSIT rls2210).'
     - '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.'
-    - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
 
 # VPP Performance Changes 2n-aws 2t1c mrr
 - type: "table"
@@ -3602,11 +4226,116 @@
     - '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.'
     - '2210.0-11 vs 2206.0-10:  Compares VPP code current vs previous.'
 
-# Detailed Test Results - VPP Performance Results 2n-zn2
+# VPP Performance Changes 3n-alt 1t1c mrr
 - type: "table"
-  title: "Detailed Test Results - VPP Performance Results 2n-zn2"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,VPP,2N,ZN2]}/"
+  title: "VPP Performance Changes 3n-alt 1t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-alt-1t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter-mrr"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-mrr-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-mrr-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter-mrr"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-alt 2t2c mrr
+- type: "table"
+  title: "VPP Performance Changes 3n-alt 2t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-alt-2t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter-mrr"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-mrr-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-mrr-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter-mrr"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# VPP Performance Changes 3n-alt 4t4c mrr
+- type: "table"
+  title: "VPP Performance Changes 3n-alt 4t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-alt-4t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T4C'"
+  columns:
+    # - title: "2202.0-10"
+    #   data-set: "vpp-3n-alt-hist-iter-mrr"
+    - title: "2206.0-10"
+      data-set: "vpp-3n-alt-prev-iter-mrr-old-env"
+    # - title: "2206.0-11"
+    #   data-set: "vpp-3n-alt-prev-iter-mrr-new-env"
+    - title: "2210.0-11"
+      data-set: "vpp-3n-alt-curr-iter-mrr"
+  comparisons:
+    # - title: "2206.0-11 vs 2206.0-10"
+    #   reference: 2
+    #   compare: 3
+    # - title: "2210.0-11 vs 2206.0-11"
+    #   reference: 3
+    #   compare: 4
+    - title: "2210.0-11 vs 2206.0-10"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:              Test cases executed for: MRR throughput on 3n-alt with xl710.'
+    - 'YYMM.V-E:               [uSec +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "10" for CSIT rls2206, "11" for CSIT rls2210).'
+    - '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.'
+    # - '2206.0-11 vs 2206.0-10: Compares CSIT environment current vs previous with previous VPP code.'
+    # - '2210.0-11 vs 2206.0-11: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2210.0-11 vs 2206.0-10: Compares current VPP code in the current CSIT environment vs previous VPP code in the previous CSIT environment.'
+
+# Detailed Test Results - VPP Performance Results 2n-zn2
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-zn2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,2N,ZN2]}/"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
@@ -3758,6 +4487,23 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 3n-snr
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 3n-snr"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,3N,SNR]}/"
+  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: "vpp-3n-snr-curr-cov"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Detailed Test Results - VPP Performance Results 2n-aws
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 2n-aws"
@@ -3930,6 +4676,23 @@
   - "name"
   - "conf-history"
 
+# Test configuration - VPP Performance Test Configs 3n-snr
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 3n-snr"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,PERF,VPP,3N,SNR]}/"
+  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-snr-curr-cov"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Test configuration - VPP Performance Test Configs 2n-aws
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 2n-aws"
@@ -4019,6 +4782,14 @@
   data: "vpp-2n-dnv-curr-cov"
   filter: "all"
 
+# Test Operational Data - VPP Performance Operational Data 3n-snr
+- type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-snr"
+  algorithm: "table_oper_data_html"
+  output-file: "{DIR[DTO,PERF,VPP,3N,SNR]}/"
+  data: "vpp-3n-snr-curr-cov"
+  filter: "all"
+
 # Test Operational Data - VPP Performance Operational Data 2n-aws
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 2n-aws"
@@ -4180,6 +4951,23 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 3n-snr
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 3n-snr"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,3N,SNR]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-3n-snr-curr-iter-mrr"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Detailed Test Results - VPP MRR Results 2n-aws
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 2n-aws"
@@ -4350,6 +5138,23 @@
   - "name"
   - "conf-history"
 
+# Test configuration - VPP MRR Test Configs 3n-snr
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-snr"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,3N,SNR]}/"
+  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-snr-curr-iter-mrr"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Test configuration - VPP MRR Test Configs 2n-aws
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 2n-aws"
@@ -4410,7 +5215,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-icx-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-3n-icx-hist-iter"
@@ -4434,7 +5239,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-icx-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-3n-icx-hist-iter"
@@ -4458,7 +5263,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-icx-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-3n-icx-hist-iter"
@@ -4482,7 +5287,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-icx-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-3n-icx-hist-iter"
@@ -4506,7 +5311,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-icx-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-icx-hist-iter"
@@ -4530,7 +5335,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-icx-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-icx-hist-iter"
@@ -4554,7 +5359,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-icx-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-icx-hist-iter"
@@ -4578,7 +5383,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-icx-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-icx-hist-iter"
@@ -4602,7 +5407,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-clx-hist-iter"
@@ -4626,7 +5431,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-clx-hist-iter"
@@ -4650,7 +5455,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-clx-hist-iter"
@@ -4674,7 +5479,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-clx-hist-iter"
@@ -4698,7 +5503,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-zn2-hist-iter"
@@ -4722,7 +5527,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-zn2-hist-iter"
@@ -4746,7 +5551,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-zn2-hist-iter"
@@ -4770,7 +5575,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  filter: "'2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-zn2-hist-iter"
@@ -4794,7 +5599,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'"
+  filter: "'1C' and 'NDRPDR'"
   columns:
     - title: "21.11"
       data-set: "dpdk-3n-tsh-hist-iter"
@@ -4818,7 +5623,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'"
+  filter: "'2C' and 'NDRPDR'"
   columns:
     - title: "21.11"
       data-set: "dpdk-3n-tsh-hist-iter"
@@ -4842,7 +5647,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'"
+  filter: "'1C' and 'NDRPDR'"
   columns:
     - title: "21.11"
       data-set: "dpdk-3n-tsh-hist-iter"
@@ -4866,7 +5671,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'"
+  filter: "'2C' and 'NDRPDR'"
   columns:
     - title: "21.11"
       data-set: "dpdk-3n-tsh-hist-iter"
@@ -4890,7 +5695,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-tx2-1t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR'"
+  filter: "'1C' and 'NDRPDR'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-tx2-hist-iter"
@@ -4914,7 +5719,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-tx2-2t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR'"
+  filter: "'2C' and 'NDRPDR'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-tx2-hist-iter"
@@ -4938,7 +5743,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-tx2-1t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR'"
+  filter: "'1C' and 'NDRPDR'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-tx2-hist-iter"
@@ -4962,7 +5767,7 @@
   algorithm: "table_comparison"
   output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-tx2-2t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR'"
+  filter: "'2C' and 'NDRPDR'"
   columns:
     - title: "21.11"
       data-set: "dpdk-2n-tx2-hist-iter"
@@ -5083,6 +5888,23 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 3n-snr
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-snr"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SNR]}/dpdk_performance_results_3n_snr"
+  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-snr-curr-iter-best"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Detailed Test Results - DPDK Performance Results 2n-tx2
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
@@ -5100,6 +5922,42 @@
   - "parent"
   - "msg"
 
+# Detailed Test Results - TRex Performance Results 2n-icx
+- type: "table"
+  title: "Detailed Test Results - TRex Performance Results 2n-icx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,TREX,2N,ICX]}/trex_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: "trex-2n-icx-curr-cov"
+  filter: "all"
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - TRex Performance Results 1n-aws
+- type: "table"
+  title: "Detailed Test Results - TRex Performance Results 1n-aws"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,TREX,1N,AWS]}/trex_performance_results_1n_aws"
+  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: "trex-1n-aws-curr-cov"
+  filter: "all"
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 ################################################################################
 ###                                F I L E S                                 ###
 ################################################################################
@@ -5120,6 +5978,7 @@
     - "{DIR[DTR,PERF,VPP,2N,DNV]}"
     - "{DIR[DTR,PERF,VPP,3N,DNV]}"
     - "{DIR[DTR,PERF,VPP,2N,AWS]}"
+    - "{DIR[DTR,PERF,VPP,3N,SNR]}"
   data:
     - "vpp-2n-clx-curr-cov"
     - "vpp-2n-icx-curr-cov"
@@ -5131,6 +5990,7 @@
     - "vpp-2n-dnv-curr-cov"
     - "vpp-3n-dnv-curr-cov"
     - "vpp-2n-aws-curr-cov"
+    - "vpp-3n-snr-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -5159,6 +6019,7 @@
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
+      - "3n-snr"
     level-3:
       - "xl710"
       - "x520"
@@ -5187,6 +6048,7 @@
     - "{DIR[DTC,PERF,VPP,2N,DNV]}"
     - "{DIR[DTC,PERF,VPP,3N,DNV]}"
     - "{DIR[DTC,PERF,VPP,2N,AWS]}"
+    - "{DIR[DTC,PERF,VPP,3N,SNR]}"
   data:
     - "vpp-2n-clx-curr-cov"
     - "vpp-2n-icx-curr-cov"
@@ -5198,6 +6060,7 @@
     - "vpp-2n-dnv-curr-cov"
     - "vpp-3n-dnv-curr-cov"
     - "vpp-2n-aws-curr-cov"
+    - "vpp-3n-snr-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -5226,6 +6089,7 @@
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
+      - "3n-snr"
     level-3:
       - "xl710"
       - "x520"
@@ -5254,6 +6118,7 @@
     - "{DIR[DTO,PERF,VPP,2N,DNV]}"
     - "{DIR[DTO,PERF,VPP,3N,DNV]}"
     - "{DIR[DTO,PERF,VPP,2N,AWS]}"
+    - "{DIR[DTO,PERF,VPP,3N,SNR]}"
   data:
     - "vpp-2n-clx-curr-cov"
     - "vpp-2n-icx-curr-cov"
@@ -5265,6 +6130,7 @@
     - "vpp-2n-dnv-curr-cov"
     - "vpp-3n-dnv-curr-cov"
     - "vpp-2n-aws-curr-cov"
+    - "vpp-3n-snr-curr-cov"
   filter: "'NDRPDR'"
   data-start-level: 4
   order-chapters:
@@ -5293,6 +6159,7 @@
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
+      - "3n-snr"
     level-3:
       - "xl710"
       - "x520"
@@ -5321,6 +6188,7 @@
     - "{DIR[DTR,MRR,VPP,2N,DNV]}"
     - "{DIR[DTR,MRR,VPP,3N,DNV]}"
     - "{DIR[DTR,MRR,VPP,2N,AWS]}"
+    - "{DIR[DTR,MRR,VPP,3N,SNR]}"
   data:
     - "vpp-2n-clx-curr-iter-mrr"
     - "vpp-2n-icx-curr-iter-mrr"
@@ -5332,6 +6200,7 @@
     - "vpp-2n-dnv-curr-iter-mrr"
     - "vpp-3n-dnv-curr-iter-mrr"
     - "vpp-2n-aws-curr-iter-mrr"
+    - "vpp-3n-snr-curr-iter-mrr"
   filter: "'MRR'"
   data-start-level: 4
   order-chapters:
@@ -5360,6 +6229,7 @@
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
+      - "3n-snr"
     level-3:
       - "xl710"
       - "x520"
@@ -5388,6 +6258,7 @@
     - "{DIR[DTC,MRR,VPP,2N,DNV]}"
     - "{DIR[DTC,MRR,VPP,3N,DNV]}"
     - "{DIR[DTC,MRR,VPP,2N,AWS]}"
+    - "{DIR[DTC,MRR,VPP,3N,SNR]}"
   data:
     - "vpp-2n-clx-curr-iter-mrr"
     - "vpp-2n-icx-curr-iter-mrr"
@@ -5399,6 +6270,7 @@
     - "vpp-2n-dnv-curr-iter-mrr"
     - "vpp-3n-dnv-curr-iter-mrr"
     - "vpp-2n-aws-curr-iter-mrr"
+    - "vpp-3n-snr-curr-iter-mrr"
   filter: "'MRR'"
   data-start-level: 4
   order-chapters:
@@ -5427,6 +6299,7 @@
       - "2n-dnv"
       - "3n-dnv"
       - "2n-aws"
+      - "3n-snr"
     level-3:
       - "xl710"
       - "x520"
@@ -5519,6 +6392,16 @@
   filter: "all"
   data-start-level: 4
 
+# DPDK Performance Results 3n-snr
+- type: "file"
+  title: "DPDK Performance Results 3n-snr"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SNR]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SNR]}"
+  data: "dpdk-3n-snr-curr-iter-best"
+  filter: "all"
+  data-start-level: 4
+
 # DPDK Performance Results 2n-tx2
 - type: "file"
   title: "DPDK Performance Results 2n-tx2"
@@ -5529,265 +6412,105 @@
   filter: "all"
   data-start-level: 4
 
+# TRex Performance Results 2n-icx
+- type: "file"
+  title: "TRex Performance Results 2n-icx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,TREX,2N,ICX]}"
+  dir-tables: "{DIR[DTR,PERF,TREX,2N,ICX]}"
+  data: "trex-2n-icx-curr-cov"
+  filter: "all"
+  data-start-level: 4
+
+# TRex Performance Results 1n-aws
+- type: "file"
+  title: "TRex Performance Results 1n-aws"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,TREX,1N,AWS]}"
+  dir-tables: "{DIR[DTR,PERF,TREX,1N,AWS]}"
+  data: "trex-1n-aws-curr-cov"
+  filter: "all"
+  data-start-level: 4
+
 ################################################################################
 ###                                P L O T S                                 ###
 ################################################################################
 
-# VSAP tests 2n-clx
-
+# Soak Test (PLRsearch), boxes - 2n-icx
 - type: "plot"
-  title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-icx-1"
+  data: "vpp-2n-icx-curr-soak"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-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-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: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
 
+# Soak Test (PLRsearch), boxes - 2n-icx
 - type: "plot"
-  title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-icx-2"
+  data: "vpp-2n-icx-curr-soak"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+    - "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: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
 
+# Soak Test (PLRsearch), boxes - 2n-clx
 - type: "plot"
-  title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
+  data: "vpp-2n-clx-curr-soak"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-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-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: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
 
+# Soak Test (PLRsearch), boxes - 2n-clx
 - type: "plot"
-  title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
+  data: "vpp-2n-clx-curr-soak"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
+    - "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: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
 
-- type: "plot"
-  title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  layout:
-    title: "2n-clx-cx556a-0B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
+###############################################################################
 
-- type: "plot"
-  title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  layout:
-    title: "2n-clx-cx556a-64B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  layout:
-    title: "2n-clx-cx556a-1024B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1Cx556A-Rdma-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  layout:
-    title: "2n-clx-cx556a-2048B-2t1c-rdma-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  layout:
-    title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  layout:
-    title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  layout:
-    title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Cps.2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-cps"
-  layout:
-    title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  layout:
-    title: "2n-clx-e810cq-0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  layout:
-    title: "2n-clx-e810cq-64B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  layout:
-    title: "2n-clx-e810cq-1024B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  data: "vpp-2n-clx-curr-iter-vsap"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1 15 0-Rps.2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0-rps"
-  layout:
-    title: "2n-clx-e810cq-2048B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1_15_0"
-    layout: "plot-hoststack"
-
-################################################################################
-
-# 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-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"
-    - "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-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-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"
-    - "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"
-
-###############################################################################
-
-# Reconf tests 2n-icx
+# 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"
@@ -7537,20 +8260,6 @@
     title: "3n-dnv-x553-64b-features-l2switching-base-ixgbe-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
-#- type: "plot"
-#  title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-{test_type}-tsa"
-#  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-{test_type}-tsa"
-#  data: "vpp-3n-dnv-curr-iter"
-#  test-type: ["ndr", "pdr"]
-#  include:
-#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-.t.c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
-#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
-#    - "Tests.Vpp.Perf.Srv6.10Ge2P1X553-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-.t.c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-{test_type}"
-#    layout: "plot-throughput-speedup-analysis"
-
 - type: "plot"
   title: "Speedup: 2n-tx2-xl710-64b-ipsec-base-scale-sw-policy-dpdk-{test_type}-tsa"
   algorithm: "plot_tsa_name"
@@ -8049,16 +8758,16 @@
   data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "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-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-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-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h4096-p63-s258048-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-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-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-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-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-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"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
     layout: "plot-cps"
@@ -8070,16 +8779,16 @@
   data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
-    - "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-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-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-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h4096-p63-s258048-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-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-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-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-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-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"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-cps"
@@ -8092,10 +8801,10 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
     title: "2n-clx-xxv710-100b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
@@ -8108,8 +8817,11 @@
   data: "vpp-2n-clx-curr-iter"
   core: ["2t1c", ]
   include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
     title: "2n-clx-xxv710-100b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
@@ -8701,16 +9413,16 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
   data: "vpp-2n-clx-curr-iter"
   include:
-    - "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-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-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-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-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h4096-p63-s258048-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-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-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-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-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-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"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis-cps"
@@ -8721,16 +9433,16 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
   data: "vpp-2n-clx-curr-iter"
   include:
-    - "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-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-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-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-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h4096-p63-s258048-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-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-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-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-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-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"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis-cps"
@@ -8742,10 +9454,10 @@
   data: "vpp-2n-clx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
     title: "2n-clx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
@@ -8757,8 +9469,11 @@
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
   data: "vpp-2n-clx-curr-iter"
   include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
     title: "2n-clx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
@@ -9277,10 +9992,10 @@
   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-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-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-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-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}"
@@ -9294,10 +10009,10 @@
   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-Ip4Base-H16384-P63-S1032192-Cps-ndrpdr.64B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-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-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-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}"
@@ -9310,8 +10025,11 @@
   data: "vpp-2n-icx-curr-iter"
   core: ["2t1c", ]
   include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H1024-P63-S64512-Tput-ndrpdr.100B-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H16384-P63-S1032192-Tput-ndrpdr.100B-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-H65536-P63-S4128768-Tput-ndrpdr.100B-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.100B-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
     title: "2n-icx-xxv710-100b-{core}-nat44ed-ip4routing-udp-tput-avf-{test_type}"
@@ -9325,10 +10043,10 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
     title: "2n-icx-xxv710-100b-{core}-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
@@ -9560,10 +10278,10 @@
   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-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-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-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-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}"
@@ -9576,10 +10294,10 @@
   data: "vpp-2n-icx-curr-iter"
   include:
     - "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-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-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-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-H65536-P63-S4128768-Cps-ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
   layout:
     title: "2n-icx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
@@ -9592,10 +10310,10 @@
   data: "vpp-2n-icx-curr-iter"
   include:
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
     title: "2n-icx-xxv710-100b-nat44ed-ip4routing-tcp-tput-avf-{test_type}"
@@ -9607,8 +10325,11 @@
   output-file: "{DIR[STATIC,VPP]}/2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-{test_type}-tsa"
   data: "vpp-2n-icx-curr-iter"
   include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-Ip4Base-H1024-P63-S64512-Tput-ndrpdr.100B-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-Nat44Ed-H1024-P63-S64512-Tput-ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-Ip4Base-H16384-P63-S1032192-Tput-ndrpdr.100B-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-Nat44Ed-H16384-P63-S1032192-Tput-ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-Ip4Base-H65536-P63-S4128768-Tput-ndrpdr.100B-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-Nat44Ed-H65536-P63-S4128768-Tput-ndrpdr.100B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
   layout:
     title: "2n-icx-xxv710-100b-nat44ed-ip4routing-udp-tput-avf-{test_type}"
@@ -9734,7 +10455,7 @@
   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"]
+  core: ["1t1c", "2t2c"]
   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"
@@ -9761,7 +10482,7 @@
   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"]
+  core: ["1t1c", "1t2c"]
   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"
@@ -9788,7 +10509,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-clx-xxv710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-clx-curr-iter"
-  core: ["2t1c", "4t2c"]
+  core: ["1t1c", "2t2c"]
   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"
@@ -9801,7 +10522,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-clx-x710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-clx-curr-iter"
-  core: ["2t1c", "4t2c"]
+  core: ["1t1c", "2t2c"]
   include:
     - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
     - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
@@ -9992,16 +10713,16 @@
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
-#    - "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-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-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-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h4096-p63-s258048-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-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-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-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-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-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"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
 #    title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
 #    layout: "plot-cps"
@@ -10014,16 +10735,16 @@
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
 #    title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
 #    layout: "plot-throughput"
@@ -10036,16 +10757,16 @@
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
-#    - "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-ip4base-h1024-p63-s64512-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-cps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-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-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h4096-p63-s258048-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-h4096-p63-s258048-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-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-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-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-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"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
 #    title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
 #    layout: "plot-cps"
@@ -10058,16 +10779,16 @@
 #  core: ["2t1c", ]
 #  test-type: ["ndr", "pdr"]
 #  include:
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-{core}-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
 #    title: "2n-zn2-xxv710-64b-{core}-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
 #    layout: "plot-throughput"
@@ -10505,16 +11226,16 @@
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}-tsa"
 #  data: "vpp-2n-zn2-curr-iter"
 #  include:
-#    - "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-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-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-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-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h4096-p63-s258048-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-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-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-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-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-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"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
 #    title: "2n-zn2-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-{test_type}"
 #    layout: "plot-throughput-speedup-analysis-cps"
@@ -10525,16 +11246,16 @@
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}-tsa"
 #  data: "vpp-2n-zn2-curr-iter"
 #  include:
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
 #    title: "2n-zn2-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-{test_type}"
 #    layout: "plot-throughput-speedup-analysis"
@@ -10545,16 +11266,16 @@
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}-tsa"
 #  data: "vpp-2n-zn2-curr-iter"
 #  include:
-#    - "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-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-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-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-ip4base-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h4096-p63-s258048-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-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-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-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-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-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-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-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"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
 #    title: "2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-{test_type}"
 #    layout: "plot-throughput-speedup-analysis-cps"
@@ -10565,16 +11286,16 @@
 #  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}-tsa"
 #  data: "vpp-2n-zn2-curr-iter"
 #  include:
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h1024-p63-s64512-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h4096-p63-s258048-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h16384-p63-s1032192-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h65536-p63-s4128768-pps-ndrpdr"
-#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-ip4base-h262144-p63-s16515072-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
 #    title: "2n-zn2-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-{test_type}"
 #    layout: "plot-throughput-speedup-analysis"
@@ -10843,7 +11564,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-zn2-xxv710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-zn2-curr-iter"
-  core: ["2t1c", "4t2c"]
+  core: ["1t1c", "2t2c"]
   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"
@@ -10856,7 +11577,7 @@
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,DPDK]}/2n-zn2-x710-64b-{core}-base-{test_type}"
   data: "dpdk-2n-zn2-curr-iter"
-  core: ["2t1c", "4t2c"]
+  core: ["1t1c", "2t2c"]
   include:
     - "tests.dpdk.perf.2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
     - "tests.dpdk.perf.2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
@@ -11066,6 +11787,52 @@
     title: "3n-icx-xxv710-64b-{core}-ip4tunnel-base-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-xxv710-imix-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-icx-e810xxv-64b-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-64b-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.64B-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-e810xxv-64b-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-icx-e810xxv-64b-{core}-ip4tunnel-gtpu-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -11305,6 +12072,49 @@
     title: "3n-icx-e810xxv-64b-ip4tunnel-gtpu-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-1518b-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-1518b-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-1518b-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-xxv710-imix-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-xxv710-imix-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1Xxv710-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-xxv710-imix-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-icx-e810xxv-64b-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-64b-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-icx-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E810Xxv-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.64B-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-icx-e810xxv-64b-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-icx-xxv710-78b-ip6routing-base-{test_type}-tsa"
   algorithm: "plot_tsa_name"
@@ -11350,16 +12160,336 @@
     title: "3n-icx-xxv710-78b-srv6-ip6routing-base-avf-{test_type}"
     layout: "plot-throughput-speedup-analysis"
 
+# 3n-snr Packet Throughput
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-64b-{core}-ip4routing-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-64b-{core}-ip4routing-base-scale-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1E822Cq-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1E822Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1E822Cq-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-64b-{core}-ip4routing-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-64b-{core}-ip4tunnel-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-64b-{core}-ip4tunnel-base-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-{core}-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-{core}-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-64b-{core}-ip4tunnel-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.1518B-{core}-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-1518b-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-imix-{core}-ip4tunnel-wireguard-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-imix-{core}-ip4tunnel-wireguard-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.imix-{core}-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-imix-{core}-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-78b-{core}-ip6routing-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-78b-{core}-ip6routing-base-scale-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1E822Cq-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1E822Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1E822Cq-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-{core}-ethip6-ip6scale20k-rnd-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-78b-{core}-ip6routing-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-64b-{core}-l2switching-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-64b-{core}-l2switching-base-scale-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1E822Cq-Eth-L2Patch-Ndrpdr.64B-{core}-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1E822Cq-Eth-L2Xcbase-Ndrpdr.64B-{core}-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1E822Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1E822Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-eth-l2bdscale10kmaclrn-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-64b-{core}-l2switching-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-imix-{core}-ipsec-ip4routing-scale-sw-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-imix-{core}-ipsec-ip4routing-scale-sw-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-imix-{core}-ipsec-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-1518b-{core}-ipsec-ip4routing-scale-sw-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-1518b-{core}-ipsec-ip4routing-scale-sw-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-1518b-{core}-ipsec-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-imix-{core}-ipsec-ip4routing-scale-scheduler-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-imix-{core}-ipsec-ip4routing-scale-scheduler-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t2c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-imix-{core}-ipsec-ip4routing-scale-scheduler-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-snr-e822cq-1518b-{core}-ipsec-ip4routing-scale-scheduler-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-1518b-{core}-ipsec-ip4routing-scale-scheduler-{test_type}"
+  data: "vpp-3n-snr-curr-iter"
+  core: ["1t2c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-{core}-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-1518b-{core}-ipsec-ip4routing-scale-scheduler-{test_type}"
+    layout: "plot-throughput"
+
+# 3n-snr Speedup
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-64b-ip4routing-base-scale-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-64b-ip4routing-base-scale-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1E822Cq-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1E822Cq-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.25Ge2P1E822Cq-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-64b-ip4routing-base-scale-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-64b-ip4tunnel-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-64b-ip4tunnel-base-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Vxlan-L2Xcbase-Ndrpdr.64B-.t.c-ethip4vxlan-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Vxlan-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-ethip4vxlan-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-64b-ip4tunnel-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-1518b-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-1518b-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.1518B-.t.c-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-1518b-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-imix-ip4tunnel-wireguard-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-imix-ip4tunnel-wireguard-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard1tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard2Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard2tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard4Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard4tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard8Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard8tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard100Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard100tnlsw-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.25Ge2P1E822Cq-Ethip4Udpwireguard1000Tnlsw-Ip4Base-Ndrpdr.imix-.t.c-ethip4udpwireguard1000tnlsw-ip4base-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-imix-ip4tunnel-wireguard-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-78b-ip6routing-base-scale-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-78b-ip6routing-base-scale-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1E822Cq-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1E822Cq-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.25Ge2P1E822Cq-Ethip6-Ip6Scale20K-Rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-78b-ip6routing-base-scale-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-64b-l2switching-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-64b-l2switching-base-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.L2.25Ge2P1E822Cq-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1E822Cq-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1E822Cq-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.25Ge2P1E822Cq-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-64b-l2switching-base-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-1518b-ipsec-ip4routing-scale-sw-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-1518b-ipsec-ip4routing-scale-sw-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-1518b-ipsec-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-imix-ipsec-ip4routing-scale-sw-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-imix-ipsec-ip4routing-scale-sw-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-imix-ipsec-ip4routing-scale-sw-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-1518b-ipsec-ip4routing-scale-scheduler-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-1518b-ipsec-ip4routing-scale-scheduler-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-1518b-ipsec-ip4routing-scale-scheduler-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-imix-ipsec-ip4routing-scale-scheduler-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-snr-e822cq-imix-ipsec-ip4routing-scale-scheduler-{test_type}-tsa"
+  data: "vpp-3n-snr-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1E822Cq-Ethip4Ipsec1Tnlswasync-Scheduler-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-.t.c-ethip4ipsec1tnlswasync-scheduler-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-imix-ipsec-ip4routing-scale-scheduler-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+# DPDK 3n-snr-e822cq
+
+- type: "plot"
+  title: "DPDK Throughput: 3n-snr-e822cq-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-snr-e822cq-64b-{core}-base-{test_type}"
+  data: "dpdk-3n-snr-curr-iter"
+  core: ["1t1c", "2t2c"]
+  include:
+    - "Tests.Dpdk.Perf.25Ge2P1E822Cq-Eth-L2Xcbase-Testpmd-Ndrpdr.64B-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "Tests.Dpdk.Perf.25Ge2P1E822Cq-Ethip4-Ip4Base-L3Fwd-Ndrpdr.64B-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Speedup: 3n-snr-e822cq-64b-base-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,DPDK]}/3n-snr-e822cq-64b-base-{test_type}-tsa"
+  data: "dpdk-3n-snr-curr-iter"
+  include:
+    - "Tests.Dpdk.Perf.25Ge2P1E822Cq-Eth-L2Xcbase-Testpmd-Ndrpdr.64B-.t.c-eth-l2xcbase-testpmd-ndrpdr"
+    - "Tests.Dpdk.Perf.25Ge2P1E822Cq-Ethip4-Ip4Base-L3Fwd-Ndrpdr.64B-.t.c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "3n-snr-e822cq-64b-base-{test_type}-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
+- type: "plot"
+  title: "Latency by percentile: TRex 2n-icx"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-2n-icx"
+  output-file-links: "{DIR[LAT,TREX]}/2n_icx.rst"
+  target-links: "../../_static/trex"
+  data: "trex-2n-icx-curr-iter-best"
+  filter: "'NIC_Intel-E810CQ'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
+
 # - type: "plot"
-#   title: "Latency by percentile: TRex 2n-skx"
+#   title: "Latency by percentile: TRex 1n-aws"
 #   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-#   output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-2n-skx"
-#   output-file-links: "{DIR[LAT,TREX]}/2n_skx.rst"
+#   output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-1n-aws"
+#   output-file-links: "{DIR[LAT,TREX]}/1n_aws.rst"
 #   target-links: "../../_static/trex"
-#   data: "trex-2n-skx-curr-iter-best"
-#   filter: "'NIC_Intel-X710'"
+#   data: "trex-1n-aws-curr-iter-best"
+#   filter: "'2T1C'"
 #   layout:
 #     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -11480,7 +12610,7 @@
   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'"
+  filter: "'1T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -11491,7 +12621,7 @@
   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'"
+  filter: "'1T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -11502,7 +12632,7 @@
   output-file-links: "{DIR[LAT,DPDK]}/2n_clx.rst"
   target-links: "../../_static/dpdk"
   data: "dpdk-2n-clx-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  filter: "'1T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -11513,7 +12643,7 @@
   output-file-links: "{DIR[LAT,DPDK]}/2n_zn2.rst"
   target-links: "../../_static/dpdk"
   data: "dpdk-2n-zn2-curr-iter-best"
-  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  filter: "'1T1C' and 'NIC_Intel-XXV710'"
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
@@ -11601,72 +12731,142 @@
 
 ###############################################################################
 
-# TRex 2n-skx
+# Hoststack tests 3n-icx
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-64b--ip4-base-scale-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4-base-scale-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Bandwidth: 3n-icx-e810xxv-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3-bps"
+  data: "vpp-3n-icx-curr-iter-hoststack"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1E810Xxv-Eth-Ip4Tcpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpbase-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1E810Xxv-Eth-Ip4Tcpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps"
+  layout:
+    title: "3n-icx-e810xxv-1460b-2t1c-eth-ip4tcp-ldpreload-iperf3"
+    layout: "plot-hoststack"
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "Bandwidth: 3n-icx-e810xxv-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-1460b-2t1c-eth-ip4udp-ldpreload-iperf3-bps"
+  data: "vpp-3n-icx-curr-iter-hoststack"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1E810Xxv-Eth-Ip4Udpbase-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpbase-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.25Ge2P1E810Xxv-Eth-Ip4Udpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-2t1c-eth-ip4udpscale1cl10s-ldpreload-iperf3-bps"
+  layout:
+    title: "3n-icx-e810xxv-1460b-2t1c-eth-ip4udp-ldpreload-iperf3"
+    layout: "plot-hoststack"
 
 # - type: "plot"
-#   title: "Throughput: 2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
+#   title: "Bandwidth: 3n-icx-e810xxv-1280b-2t1c-eth-ip4udpquic-vppecho"
+#   algorithm: "plot_perf_box_name"
+#   output-file: "{DIR[STATIC,VPP]}/3n-icx-e810xxv-1280b-2t1c-eth-ip4udpquic-vppecho-bps"
+#   data: "vpp-3n-icx-curr-iter-hoststack"
 #   include:
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+#     - "Tests.Vpp.Perf.Hoststack.25Ge2P1E810Xxv-Eth-Ip4Udpquicbase-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicbase-vppecho-bps"
+#     - "Tests.Vpp.Perf.Hoststack.25Ge2P1E810Xxv-Eth-Ip4Udpquicscale1Cl10S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale1cl10s-vppecho-bps"
+#     - "Tests.Vpp.Perf.Hoststack.25Ge2P1E810Xxv-Eth-Ip4Udpquicscale10Cl1S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale10cl1s-vppecho-bps"
+#     - "Tests.Vpp.Perf.Hoststack.25Ge2P1E810Xxv-Eth-Ip4Udpquicscale10Cl10S-Vppecho-Bps.1280B-2t1c-eth-ip4udpquicscale10cl10s-vppecho-bps"
 #   layout:
-#     title: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-#     layout: "plot-throughput"
+#     title: "3n-icx-e810xxv-1280b-2t1c-eth-ip4udpquic-vppecho"
+#     layout: "plot-hoststack"
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-78b--ip6-base-scale-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-78b--ip6-base-scale-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
-#     - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
-#     layout: "plot-throughput"
+###############################################################################
 
-# - type: "plot"
-#   title: "Throughput: 2n-skx-x710-64b--l2-scale-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,TREX]}/2n-skx-x710-64b--l2-scale-{test_type}"
-#   data: "trex-2n-skx-curr-iter"
-#   core: ["2t1c", ]
-#   include:
-#     - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
-#   layout:
-#     title: "2n-skx-x710-64b--l2-scale-{test_type}"
-#     layout: "plot-throughput"
+# TRex 2n-icx
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b--ip4-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--ip4-base-scale-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b--ip4-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b--ip4routing-stf-cps-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--ip4routing-stf-cps-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b--ip4routing-stf-cps-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b--ip4routing-stf-tput-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--ip4routing-stf-tput-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H1024-P63-S64512-tput-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-tput-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H1024-P63-S64512-tput-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H262144-P63-S16515072-tput-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b--ip4routing-stf-tput-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-78b--ip6-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-78b--ip6-base-scale-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip6.1N1L-100Ge2P1E810Cq-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip6.1N1L-100Ge2P1E810Cq-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-78b--ip6-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-icx-e810cq-64b--l2-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/2n-icx-e810cq-64b--l2-scale-{test_type}"
+  data: "trex-2n-icx-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.L2.1N1L-100Ge2P1E810Cq-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
+  layout:
+    title: "2n-icx-e810cq-64b--l2-scale-{test_type}"
+    layout: "plot-throughput"
+
+# TRex 1n-aws
+
+- type: "plot"
+  title: "Throughput: 1n-aws-nitro50g-64b--ip4-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/1n-aws-nitro50g-64b--ip4-base-scale-{test_type}"
+  data: "trex-1n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip4.1N1L-50Ge1P1Ena-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip4.1N1L-50Ge1P1Ena-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+  layout:
+    title: "1n-aws-nitro50g-64b--ip4-base-scale-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 1n-aws-nitro50g-78b--ip6-base-scale-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,TREX]}/1n-aws-nitro50g-78b--ip6-base-scale-{test_type}"
+  data: "trex-1n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Trex.Perf.Ip6.1N1L-50Ge1P1Ena-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+    - "Tests.Trex.Perf.Ip6.1N1L-50Ge1P1Ena-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+  layout:
+    title: "1n-aws-nitro50g-78b--ip6-base-scale-{test_type}"
+    layout: "plot-throughput"