X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Freport%2Felements.yaml;h=cea5e477f0f74c76d8ca15d812e7d93e9faa78de;hb=47104ebac9be62bc437e28549c498348d3f9dd42;hp=9d4163e363bd1d6650a93bee5becf1b4c6b90f5f;hpb=c8522a6e5f133dd516958fff6d326b097d1c845d;p=csit.git

diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 9d4163e363..cea5e477f0 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -29,47 +29,47 @@
     - job-spec: "trex-mlr-00"
       data-set: "trex-2n-icx-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-icx-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-icx-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-icx-curr-cov"
-#   lines:
-#     - job-spec: "gso-00"
-#       build: "1"
-#     - job-spec: "ip4-00"
-#       build: "2"
-#     - job-spec: "ip4-01"
-#       build: "3"
-#     - job-spec: "ip4-02"
-#       build: "4"
-#     - job-spec: "ip4-03"
-#       build: "5"
-#     - job-spec: "ip4-04"
-#       build: "6"
-#     - job-spec: "ip4-05"
-#       build: "7"
-#     - job-spec: "ip4-06"
-#       build: "8"
-#     - job-spec: "ip4-07"
-#       build: "9"
-#     - job-spec: "ip4tun-00"
-#       build: "10"
-#     - job-spec: "ip6-00"
-#       build: "11"
-#     - job-spec: "ip6-01"
-#       build: "12"
-#     - job-spec: "l2-00"
-#       build: "13"
-#     - job-spec: "l2-01"
-#       build: "14"
-#     - job-spec: "lb-00"
-#       build: "15"
-#     - job-spec: "memif-00"
-#       build: "16"
-#     - job-spec: "vhost-00"
-#       build: "17"
+- type: "table"
+  title: "Job Specification Duration: 2n-icx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-icx-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-icx-curr-cov"
+  lines:
+    - job-spec: "gso-00"
+      build: "2"
+    - job-spec: "ip4-00"
+      build: "8"
+    - job-spec: "ip4-01"
+      build: "3"
+    - job-spec: "ip4-02"
+      build: "17"
+    - job-spec: "ip4-03"
+      build: "5"
+    - job-spec: "ip4-04"
+      build: "6"
+    - job-spec: "ip4-05"
+      build: "7"
+    - job-spec: "ip4-06"
+      build: "18"
+    - job-spec: "ip4-07"
+      build: "9"
+    - job-spec: "ip4tun-00"
+      build: "10"
+    - job-spec: "ip6-00"
+      build: "14"
+    - job-spec: "ip6-01"
+      build: "20"
+    - job-spec: "l2-00"
+      build: "25"
+    - job-spec: "l2-01"
+      build: "21"
+    - job-spec: "lb-00"
+      build: "22"
+    - job-spec: "memif-00"
+      build: "23"
+    - job-spec: "vhost-00"
+      build: "24"
 
 - type: "table"
   title: "Job Specification Duration: 3n-icx-iterative"
@@ -86,33 +86,33 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-3n-icx-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-icx-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-icx-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-icx-curr-cov"
-#   lines:
-#     - job-spec: "crypto-00"
-#       build: "1"
-#     - job-spec: "crypto-01"
-#       build: "2"
-#     - job-spec: "crypto-02"
-#       build: "3"
-#     - job-spec: "crypto-03"
-#       build: "35"
-#     - job-spec: "crypto-04"
-#       build: "4"
-#     - job-spec: "crypto-05"
-#       build: "34"
-#     - job-spec: "ip4-00"
-#       build: "5"
-#     - job-spec: "ip4-01"
-#       build: "6"
-#     - job-spec: "ip4-02"
-#       build: "7"
-#     - job-spec: "ip4-03"
-#       build: "8"
+- type: "table"
+  title: "Job Specification Duration: 3n-icx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-icx-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-icx-curr-cov"
+  lines:
+    - job-spec: "crypto-00"
+      build: "7"
+    - job-spec: "crypto-01"
+      build: "8"
+    - job-spec: "crypto-02"
+      build: "10"
+    - job-spec: "crypto-03"
+      build: "9"
+    - job-spec: "crypto-04"
+      build: "12"
+    - job-spec: "crypto-05"
+      build: "11"
+    - job-spec: "ip4-00"
+      build: "13"
+    - job-spec: "ip4-01"
+      build: "14"
+    - job-spec: "ip4-02"
+      build: "15"
+    - job-spec: "ip4-03"
+      build: "16"
 #     - job-spec: "ip4-04"
 #       build: "9"
 #     - job-spec: "ip4-05"
@@ -187,47 +187,47 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-2n-clx-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-clx-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-clx-curr-cov"
-#   lines:
-#     - job-spec: "gso-00"
-#       build: "4"
-#     - job-spec: "ip4-00"
-#       build: "5"
-#     - job-spec: "ip4-01"
-#       build: "6"
-#     - job-spec: "ip4-02"
-#       build: "7"
-#     - job-spec: "ip4-03"
-#       build: "8"
-#     - job-spec: "ip4-04"
-#       build: "9"
-#     - job-spec: "ip4-05"
-#       build: "10"
-#     - job-spec: "ip4-06"
-#       build: "11"
-#     - job-spec: "ip4-07"
-#       build: "12"
-#     - job-spec: "ip4tun-00"
-#       build: "13"
-#     - job-spec: "ip6-00"
-#       build: "14"
-#     - job-spec: "ip6-01"
-#       build: "15"
-#     - job-spec: "l2-00"
-#       build: "16"
-#     - job-spec: "l2-01"
-#       build: "17"
-#     - job-spec: "lb-00"
-#       build: "18"
-#     - job-spec: "memif-00"
-#       build: "19"
-#     - job-spec: "vhost-00"
-#       build: "20"
+- type: "table"
+  title: "Job Specification Duration: 2n-clx-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-clx-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-clx-curr-cov"
+  lines:
+    - job-spec: "gso-00"
+      build: "2"
+    - job-spec: "ip4-00"
+      build: "3"
+    - job-spec: "ip4-01"
+      build: "4"
+    - job-spec: "ip4-02"
+      build: "5"
+    - job-spec: "ip4-03"
+      build: "6"
+    - job-spec: "ip4-04"
+      build: "7"
+    - job-spec: "ip4-05"
+      build: "12"
+    - job-spec: "ip4-06"
+      build: "9"
+    - job-spec: "ip4-07"
+      build: "10"
+    - job-spec: "ip4tun-00"
+      build: "11"
+    - job-spec: "ip6-00"
+      build: "13"
+    - job-spec: "ip6-01"
+      build: "14"
+    - job-spec: "l2-00"
+      build: "15"
+    - job-spec: "l2-01"
+      build: "16"
+    - job-spec: "lb-00"
+      build: "17"
+    - job-spec: "memif-00"
+      build: "18"
+    - job-spec: "vhost-00"
+      build: "19"
 
 - type: "table"
   title: "Job Specification Duration: 2n-dnv-iterative"
@@ -240,25 +240,25 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-dnv-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-dnv-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-dnv-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
-#       build: "7"
-#     - job-spec: "ip6-00"
-#       build: "3"
-#     - job-spec: "ip6-01"
-#       build: "4"
-#     - job-spec: "l2-00"
-#       build: "5"
-#     - job-spec: "l2-01"
-#       build: "6"
+- type: "table"
+  title: "Job Specification Duration: 2n-dnv-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-dnv-curr-cov"
+  lines:
+    - job-spec: "ip4-00"
+      build: "2"
+    - job-spec: "ip4-01"
+      build: "3"
+    - job-spec: "ip6-00"
+      build: "4"
+    - job-spec: "ip6-01"
+      build: "5"
+    - job-spec: "l2-00"
+      build: "6"
+    - job-spec: "l2-01"
+      build: "7"
 
 - type: "table"
   title: "Job Specification Duration: 2n-aws-iterative"
@@ -271,15 +271,15 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-aws-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-aws-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-aws-curr-cov"
-#   lines:
-#     - job-spec: "vpp-00"
-#       build: "1"
+- type: "table"
+  title: "Job Specification Duration: 2n-aws-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-aws-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-aws-curr-cov"
+  lines:
+    - job-spec: "vpp-00"
+      build: "1"
 
 - type: "table"
   title: "Job Specification Duration: 2n-tx2-iterative"
@@ -292,41 +292,41 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-tx2-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-tx2-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-tx2-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
-#       build: "2"
-#     - job-spec: "ip4-02"
-#       build: "3"
-#     - job-spec: "ip4-03"
-#       build: "4"
-#     - job-spec: "ip4-04"
-#       build: "5"
-#     - job-spec: "ip4-05"
-#       build: "6"
-#     - job-spec: "ip4-06"
-#       build: "7"
-#     - job-spec: "ip6-00"
-#       build: "8"
-#     - job-spec: "ip6-01"
-#       build: "9"
-#     - job-spec: "l2-00"
-#       build: "10"
-#     - job-spec: "l2-01"
-#       build: "11"
-#     - job-spec: "l2-02"
-#       build: "12"
-#     - job-spec: "l2-03"
-#       build: "13"
-#     - job-spec: "l2-04"
-#       build: "14"
+- type: "table"
+  title: "Job Specification Duration: 2n-tx2-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-tx2-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-tx2-curr-cov"
+  lines:
+    - job-spec: "ip4-00"
+      build: "2"
+    - job-spec: "ip4-01"
+      build: "3"
+    - job-spec: "ip4-02"
+      build: "4"
+    - job-spec: "ip4-03"
+      build: "5"
+    - job-spec: "ip4-04"
+      build: "6"
+    - job-spec: "ip4-05"
+      build: "7"
+    - job-spec: "ip4-06"
+      build: "8"
+    - job-spec: "ip6-00"
+      build: "9"
+    - job-spec: "ip6-01"
+      build: "10"
+    - job-spec: "l2-00"
+      build: "11"
+    - job-spec: "l2-01"
+      build: "12"
+    - job-spec: "l2-02"
+      build: "13"
+    - job-spec: "l2-03"
+      build: "14"
+    - job-spec: "l2-04"
+      build: "15"
 
 - type: "table"
   title: "Job Specification Duration: 2n-zn2-iterative"
@@ -343,43 +343,43 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-2n-zn2-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 2n-zn2-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-cov"
-#   jb-type: "coverage"
-#   data: "vpp-2n-zn2-curr-cov"
-#   lines:
-#     - job-spec: "gso-00"
-#       build: "1"
-#     - job-spec: "ip4-00"
-#       build: "2"
-#     - job-spec: "ip4-01"
-#       build: "3"
-#     - job-spec: "ip4-02"
-#       build: "4"
-#     - job-spec: "ip4-03"
-#       build: "5"
-#     - job-spec: "ip4-04"
-#       build: "6"
-#     - job-spec: "ip4-05"
-#       build: "7"
-#     - job-spec: "ip4tun-00"
-#       build: "8"
-#     - job-spec: "ip6-00"
-#       build: "9"
-#     - job-spec: "ip6-01"
-#       build: "10"
-#     - job-spec: "l2-00"
-#       build: "11"
-#     - job-spec: "l2-01"
-#       build: "12"
-#     - job-spec: "lb-00"
-#       build: "13"
-#     - job-spec: "memif-00"
-#       build: "14"
-#     - job-spec: "vhost-00"
-#       build: "15"
+- type: "table"
+  title: "Job Specification Duration: 2n-zn2-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-zn2-cov"
+  jb-type: "coverage"
+  data: "vpp-2n-zn2-curr-cov"
+  lines:
+    - job-spec: "gso-00"
+      build: "2"
+    - job-spec: "ip4-00"
+      build: "3"
+    - job-spec: "ip4-01"
+      build: "4"
+    - job-spec: "ip4-02"
+      build: "5"
+    - job-spec: "ip4-03"
+      build: "6"
+    - job-spec: "ip4-04"
+      build: "7"
+    - job-spec: "ip4-05"
+      build: "8"
+    - job-spec: "ip4tun-00"
+      build: "9"
+    - job-spec: "ip6-00"
+      build: "10"
+    - job-spec: "ip6-01"
+      build: "11"
+    - job-spec: "l2-00"
+      build: "12"
+    - job-spec: "l2-01"
+      build: "13"
+    - job-spec: "lb-00"
+      build: "14"
+    - job-spec: "memif-00"
+      build: "15"
+    - job-spec: "vhost-00"
+      build: "16"
 
 - type: "table"
   title: "Job Specification Duration: 3n-dnv-iterative"
@@ -392,33 +392,33 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-3n-dnv-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-dnv-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-dnv-curr-cov"
-#   lines:
-#     - job-spec: "crypto-00"
-#       build: "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-dnv-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-dnv-curr-cov"
+  lines:
+    - job-spec: "crypto-00"
+      build: "2"
+    - job-spec: "crypto-01"
+      build: "3"
+    - job-spec: "crypto-02"
+      build: "4"
+    - job-spec: "ip4-00"
+      build: "5"
+    - job-spec: "ip4-01"
+      build: "6"
+    - job-spec: "ip4tun-00"
+      build: "7"
+    - job-spec: "ip6-00"
+      build: "8"
+    - job-spec: "ip6-01"
+      build: "9"
+    - job-spec: "l2-00"
+      build: "10"
+    - job-spec: "l2-01"
+      build: "11"
 
 - type: "table"
   title: "Job Specification Duration: 3n-snr-iterative"
@@ -433,33 +433,35 @@
     - 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-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: "ip4tun-01"
+      build: "11"      
+    - 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"
@@ -474,47 +476,47 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-3n-tsh-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-tsh-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-tsh-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
-#       build: "2"
-#     - job-spec: "ip4-02"
-#       build: "3"
-#     - job-spec: "ip4-03"
-#       build: "4"
-#     - job-spec: "ip4tun-00"
-#       build: "5"
-#     - job-spec: "ip6-00"
-#       build: "6"
-#     - job-spec: "ip6-01"
-#       build: "7"
-#     - job-spec: "l2-00"
-#       build: "8"
-#     - job-spec: "l2-01"
-#       build: "9"
-#     - job-spec: "l2-02"
-#       build: "10"
-#     - job-spec: "l2-03"
-#       build: "11"
-#     - job-spec: "l2-04"
-#       build: "12"
-#     - job-spec: "memif-00"
-#       build: "13"
-#     - job-spec: "srv6-00"
-#       build: "14"
-#     - job-spec: "srv6-01"
-#       build: "15"
-#     - job-spec: "vhost-00"
-#       build: "16"
-#     - job-spec: "vhost-01"
-#       build: "17"
+- type: "table"
+  title: "Job Specification Duration: 3n-tsh-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-tsh-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-tsh-curr-cov"
+  lines:
+    - job-spec: "ip4-00"
+      build: "1"
+    - job-spec: "ip4-01"
+      build: "2"
+    - job-spec: "ip4-02"
+      build: "3"
+    - job-spec: "ip4-03"
+      build: "4"
+    - job-spec: "ip4tun-00"
+      build: "5"
+    - job-spec: "ip6-00"
+      build: "6"
+    - job-spec: "ip6-01"
+      build: "7"
+    - job-spec: "l2-00"
+      build: "8"
+    - job-spec: "l2-01"
+      build: "9"
+    - job-spec: "l2-02"
+      build: "10"
+    - job-spec: "l2-03"
+      build: "11"
+    - job-spec: "l2-04"
+      build: "12"
+    - job-spec: "memif-00"
+      build: "13"
+    - job-spec: "srv6-00"
+      build: "14"
+    - job-spec: "srv6-01"
+      build: "15"
+    - job-spec: "vhost-00"
+      build: "16"
+    - job-spec: "vhost-01"
+      build: "17"
 
 - type: "table"
   title: "Job Specification Duration: 3n-alt-iterative"
@@ -529,47 +531,47 @@
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-3n-alt-curr-iter"
 
-# - type: "table"
-#   title: "Job Specification Duration: 3n-alt-coverage"
-#   algorithm: "table_job_spec_duration"
-#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-alt-cov"
-#   jb-type: "coverage"
-#   data: "vpp-3n-alt-curr-cov"
-#   lines:
-#     - job-spec: "ip4-00"
-#       build: "1"
-#     - job-spec: "ip4-01"
-#       build: "2"
-#     - job-spec: "ip4-02"
-#       build: "3"
-#     - job-spec: "ip4-03"
-#       build: "4"
-#     - job-spec: "ip4tun-00"
-#       build: "5"
-#     - job-spec: "ip6-00"
-#       build: "6"
-#     - job-spec: "ip6-01"
-#       build: "7"
-#     - job-spec: "l2-00"
-#       build: "8"
-#     - job-spec: "l2-01"
-#       build: "9"
-#     - job-spec: "l2-02"
-#       build: "10"
-#     - job-spec: "l2-03"
-#       build: "11"
-#     - job-spec: "l2-04"
-#       build: "12"
-#     - job-spec: "memif-00"
-#       build: "13"
-#     - job-spec: "srv6-00"
-#       build: "14"
-#     - job-spec: "srv6-01"
-#       build: "15"
-#     - job-spec: "vhost-00"
-#       build: "16"
-#     - job-spec: "vhost-01"
-#       build: "17"
+- type: "table"
+  title: "Job Specification Duration: 3n-alt-coverage"
+  algorithm: "table_job_spec_duration"
+  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-alt-cov"
+  jb-type: "coverage"
+  data: "vpp-3n-alt-curr-cov"
+  lines:
+    - job-spec: "ip4-00"
+      build: "2"
+    - job-spec: "ip4-01"
+      build: "3"
+    - job-spec: "ip4-02"
+      build: "4"
+    - job-spec: "ip4-03"
+      build: "6"
+    - job-spec: "ip4tun-00"
+      build: "5"
+    - job-spec: "ip6-00"
+      build: "12"
+    - job-spec: "ip6-01"
+      build: "7"
+    - job-spec: "l2-00"
+      build: "8"
+    - job-spec: "l2-01"
+      build: "9"
+    - job-spec: "l2-02"
+      build: "10"
+    - job-spec: "l2-03"
+      build: "11"
+    - job-spec: "l2-04"
+      build: "13"
+    - job-spec: "memif-00"
+      build: "14"
+    - job-spec: "srv6-00"
+      build: "15"
+    - job-spec: "srv6-01"
+      build: "16"
+    - job-spec: "vhost-00"
+      build: "17"
+    - job-spec: "vhost-01"
+      build: "18"
 
 # VPP Normalized Comparison Across Testbeds 2n-clx to 2n-icx 1c ndr
 - type: "table"
@@ -6412,6 +6414,26 @@
   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                                 ###
 ################################################################################
@@ -10435,7 +10457,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"
@@ -10462,7 +10484,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"
@@ -10489,7 +10511,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"
@@ -10502,7 +10524,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"
@@ -11544,7 +11566,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"
@@ -11557,7 +11579,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"
@@ -11767,6 +11789,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"
@@ -12006,6 +12074,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"
@@ -12080,6 +12191,40 @@
     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"
@@ -12190,6 +12335,38 @@
     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"
@@ -12307,16 +12484,16 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
-- type: "plot"
-  title: "Latency by percentile: TRex 1n-aws"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  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-1n-aws-curr-iter-best"
-  filter: "'2T1C'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
+# - type: "plot"
+#   title: "Latency by percentile: TRex 1n-aws"
+#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
+#   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-1n-aws-curr-iter-best"
+#   filter: "'2T1C'"
+#   layout:
+#     layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 2n-zn2"
@@ -12435,7 +12612,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"
 
@@ -12446,7 +12623,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"
 
@@ -12457,7 +12634,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"
 
@@ -12468,7 +12645,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"
 
@@ -12629,18 +12806,18 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-icx-e810cq-64b--ip4routing-stf-pps-{test_type}"
+  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-pps-{test_type}"
+  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-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-100Ge2P1E810Cq-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.100B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+    - "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-pps-{test_type}"
+    title: "2n-icx-e810cq-64b--ip4routing-stf-tput-{test_type}"
     layout: "plot-throughput"
 
 - type: "plot"