X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecifications%2Freport%2Felements.yaml;h=c33d5648e926bb1c52fb34a7fe9b9a8bb06bd685;hp=2abc5671123879a2372f556a95242aef9e106020;hb=902cea84c1688e998867f50f02f3e058e27467a0;hpb=75119f759eb2020bb6fb6543e11877f9c256dc5f

diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 2abc567112..c33d5648e9 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -17,8 +17,8 @@
       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: "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"
@@ -28,47 +28,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: "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-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: "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-dnv-iterative"
@@ -81,25 +81,25 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-2n-dnv-curr-iter"
 
-- type: "table"
-  title: "Job Specification Duration: 2n-dnv-coverage"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-cov"
-  jb-type: "coverage"
-  data: "vpp-2n-dnv-curr-cov"
-  lines:
-    - job-spec: "ip4-00"
-      build: "7"
-    - job-spec: "ip4-01"
-      build: "8"
-    - job-spec: "ip6-00"
-      build: "9"
-    - job-spec: "ip6-01"
-      build: "10"
-    - job-spec: "l2-00"
-      build: "11"
-    - job-spec: "l2-01"
-      build: "13"
+# - type: "table"
+#   title: "Job Specification Duration: 2n-dnv-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-dnv-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-dnv-curr-cov"
+#   lines:
+#     - job-spec: "ip4-00"
+#       build: "7"
+#     - job-spec: "ip4-01"
+#       build: "8"
+#     - job-spec: "ip6-00"
+#       build: "9"
+#     - job-spec: "ip6-01"
+#       build: "10"
+#     - job-spec: "l2-00"
+#       build: "11"
+#     - job-spec: "l2-01"
+#       build: "13"
 
 - type: "table"
   title: "Job Specification Duration: 2n-aws-iterative"
@@ -112,15 +112,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: 3n-aws-iterative"
@@ -133,15 +133,15 @@
     - job-spec: "vpp-mlr-00"
       data-set: "vpp-3n-aws-curr-iter"
 
-- type: "table"
-  title: "Job Specification Duration: 3n-aws-coverage"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-aws-cov"
-  jb-type: "coverage"
-  data: "vpp-3n-aws-curr-cov"
-  lines:
-    - job-spec: "vpp-00"
-      build: "1"
+# - type: "table"
+#   title: "Job Specification Duration: 3n-aws-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-aws-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-aws-curr-cov"
+#   lines:
+#     - job-spec: "vpp-00"
+#       build: "1"
 
 - type: "table"
   title: "Job Specification Duration: 2n-skx-iterative"
@@ -168,47 +168,47 @@
     - job-spec: "trex-mlr-00"
       data-set: "trex-2n-skx-curr-iter"
 
-- type: "table"
-  title: "Job Specification Duration: 2n-skx-coverage"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-cov"
-  jb-type: "coverage"
-  data: "vpp-2n-skx-curr-cov"
-  lines:
-    - job-spec: "gso-00"
-      build: "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-skx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-2n-skx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-2n-skx-curr-cov"
+#   lines:
+#     - job-spec: "gso-00"
+#       build: "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-tx2-iterative"
@@ -221,41 +221,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: "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-zn2-iterative"
@@ -272,43 +272,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: "18"
-    - 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: "19"
-    - 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: "1"
+#     - job-spec: "ip4-00"
+#       build: "2"
+#     - job-spec: "ip4-01"
+#       build: "3"
+#     - job-spec: "ip4-02"
+#       build: "4"
+#     - job-spec: "ip4-03"
+#       build: "18"
+#     - job-spec: "ip4-04"
+#       build: "6"
+#     - job-spec: "ip4-05"
+#       build: "7"
+#     - job-spec: "ip4tun-00"
+#       build: "8"
+#     - job-spec: "ip6-00"
+#       build: "9"
+#     - job-spec: "ip6-01"
+#       build: "19"
+#     - 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: 3n-dnv-iterative"
@@ -321,33 +321,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: "11"
-    - job-spec: "crypto-01"
-      build: "12"
-    - job-spec: "crypto-02"
-      build: "13"
-    - job-spec: "ip4-00"
-      build: "14"
-    - job-spec: "ip4-01"
-      build: "15"
-    - job-spec: "ip4tun-00"
-      build: "16"
-    - job-spec: "ip6-00"
-      build: "17"
-    - job-spec: "ip6-01"
-      build: "10"
-    - job-spec: "l2-00"
-      build: "20"
-    - job-spec: "l2-01"
-      build: "21"
+# - type: "table"
+#   title: "Job Specification Duration: 3n-dnv-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-dnv-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-dnv-curr-cov"
+#   lines:
+#     - job-spec: "crypto-00"
+#       build: "11"
+#     - job-spec: "crypto-01"
+#       build: "12"
+#     - job-spec: "crypto-02"
+#       build: "13"
+#     - job-spec: "ip4-00"
+#       build: "14"
+#     - job-spec: "ip4-01"
+#       build: "15"
+#     - job-spec: "ip4tun-00"
+#       build: "16"
+#     - job-spec: "ip6-00"
+#       build: "17"
+#     - job-spec: "ip6-01"
+#       build: "10"
+#     - job-spec: "l2-00"
+#       build: "20"
+#     - job-spec: "l2-01"
+#       build: "21"
 
 - type: "table"
   title: "Job Specification Duration: 3n-skx-iterative"
@@ -363,84 +363,82 @@
       data-set: "vpp-3n-skx-curr-iter-hoststack"
     - job-spec: "dpdk-mlr-00"
       data-set: "dpdk-3n-skx-curr-iter"
-    - job-spec: "trex-mlr-00"
-      data-set: "trex-3n-skx-curr-iter"
 
-- type: "table"
-  title: "Job Specification Duration: 3n-skx-coverage"
-  algorithm: "table_job_spec_duration"
-  output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-cov"
-  jb-type: "coverage"
-  data: "vpp-3n-skx-curr-cov"
-  lines:
-    - job-spec: "crypto-00"
-      build: "1"
-    - job-spec: "crypto-01"
-      build: "3"
-    - job-spec: "crypto-02"
-      build: "4"
-    - job-spec: "crypto-03"
-      build: "36"
-    - job-spec: "crypto-04"
-      build: "6"
-    - job-spec: "ip4-00"
-      build: "7"
-    - job-spec: "ip4-01"
-      build: "8"
-    - job-spec: "ip4-02"
-      build: "9"
-    - job-spec: "ip4-03"
-      build: "10"
-    - job-spec: "ip4-04"
-      build: "11"
-    - job-spec: "ip4-05"
-      build: "12"
-    - job-spec: "ip4-06"
-      build: "13"
-    - job-spec: "ip4-07"
-      build: "14"
-    - job-spec: "ip4tun-00"
-      build: "15"
-    - job-spec: "ip4tun-02"
-      build: "16"
-    - job-spec: "ip6-00"
-      build: "17"
-    - job-spec: "ip6-01"
-      build: "18"
-    - job-spec: "ip6tun-00"
-      build: "19"
-    - job-spec: "l2-00"
-      build: "20"
-    - job-spec: "l2-01"
-      build: "21"
-    - job-spec: "l2-02"
-      build: "22"
-    - job-spec: "l2-03"
-      build: "23"
-    - job-spec: "l2-04"
-      build: "24"
-    - job-spec: "l2-05"
-      build: "25"
-    - job-spec: "l2-06"
-      build: "26"
-    - job-spec: "l2-07"
-      build: "27"
-    - job-spec: "l2-08"
-      build: "28"
-    - job-spec: "l2-09"
-      build: "29"
-    - job-spec: "l2-10"
-      build: "30"
-    - job-spec: "memif-00"
-      build: "31"
-    - job-spec: "srv6-00"
-      build: "32"
-    - job-spec: "srv6-01"
-      build: "33"
-    - job-spec: "vhost-00"
-      build: "34"
-    - job-spec: "vhost-01"
-      build: "35"
+# - type: "table"
+#   title: "Job Specification Duration: 3n-skx-coverage"
+#   algorithm: "table_job_spec_duration"
+#   output-file: "{DIR[STATIC,VPP]}/job-spec-duration-3n-skx-cov"
+#   jb-type: "coverage"
+#   data: "vpp-3n-skx-curr-cov"
+#   lines:
+#     - job-spec: "crypto-00"
+#       build: "1"
+#     - job-spec: "crypto-01"
+#       build: "3"
+#     - job-spec: "crypto-02"
+#       build: "4"
+#     - job-spec: "crypto-03"
+#       build: "36"
+#     - job-spec: "crypto-04"
+#       build: "6"
+#     - job-spec: "ip4-00"
+#       build: "7"
+#     - job-spec: "ip4-01"
+#       build: "8"
+#     - job-spec: "ip4-02"
+#       build: "9"
+#     - job-spec: "ip4-03"
+#       build: "10"
+#     - job-spec: "ip4-04"
+#       build: "11"
+#     - job-spec: "ip4-05"
+#       build: "12"
+#     - job-spec: "ip4-06"
+#       build: "13"
+#     - job-spec: "ip4-07"
+#       build: "14"
+#     - job-spec: "ip4tun-00"
+#       build: "15"
+#     - job-spec: "ip4tun-02"
+#       build: "16"
+#     - job-spec: "ip6-00"
+#       build: "17"
+#     - job-spec: "ip6-01"
+#       build: "18"
+#     - job-spec: "ip6tun-00"
+#       build: "19"
+#     - job-spec: "l2-00"
+#       build: "20"
+#     - job-spec: "l2-01"
+#       build: "21"
+#     - job-spec: "l2-02"
+#       build: "22"
+#     - job-spec: "l2-03"
+#       build: "23"
+#     - job-spec: "l2-04"
+#       build: "24"
+#     - job-spec: "l2-05"
+#       build: "25"
+#     - job-spec: "l2-06"
+#       build: "26"
+#     - job-spec: "l2-07"
+#       build: "27"
+#     - job-spec: "l2-08"
+#       build: "28"
+#     - job-spec: "l2-09"
+#       build: "29"
+#     - job-spec: "l2-10"
+#       build: "30"
+#     - job-spec: "memif-00"
+#       build: "31"
+#     - job-spec: "srv6-00"
+#       build: "32"
+#     - job-spec: "srv6-01"
+#       build: "33"
+#     - job-spec: "vhost-00"
+#       build: "34"
+#     - job-spec: "vhost-01"
+#       build: "35"
 
 - type: "table"
   title: "Job Specification Duration: 3n-tsh-iterative"
@@ -455,47 +453,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: "7"
-    - job-spec: "ip4-01"
-      build: "8"
-    - job-spec: "ip4-02"
-      build: "9"
-    - job-spec: "ip4-03"
-      build: "10"
-    - job-spec: "ip4tun-00"
-      build: "15"
-    - job-spec: "ip6-00"
-      build: "17"
-    - job-spec: "ip6-01"
-      build: "18"
-    - job-spec: "l2-00"
-      build: "20"
-    - job-spec: "l2-01"
-      build: "21"
-    - job-spec: "l2-02"
-      build: "22"
-    - job-spec: "l2-03"
-      build: "23"
-    - job-spec: "l2-04"
-      build: "24"
-    - job-spec: "memif-00"
-      build: "31"
-    - job-spec: "srv6-00"
-      build: "32"
-    - job-spec: "srv6-01"
-      build: "33"
-    - job-spec: "vhost-00"
-      build: "34"
-    - job-spec: "vhost-01"
-      build: "35"
+# - 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: "7"
+#     - job-spec: "ip4-01"
+#       build: "8"
+#     - job-spec: "ip4-02"
+#       build: "9"
+#     - job-spec: "ip4-03"
+#       build: "10"
+#     - job-spec: "ip4tun-00"
+#       build: "15"
+#     - job-spec: "ip6-00"
+#       build: "17"
+#     - job-spec: "ip6-01"
+#       build: "18"
+#     - job-spec: "l2-00"
+#       build: "20"
+#     - job-spec: "l2-01"
+#       build: "21"
+#     - job-spec: "l2-02"
+#       build: "22"
+#     - job-spec: "l2-03"
+#       build: "23"
+#     - job-spec: "l2-04"
+#       build: "24"
+#     - job-spec: "memif-00"
+#       build: "31"
+#     - job-spec: "srv6-00"
+#       build: "32"
+#     - job-spec: "srv6-01"
+#       build: "33"
+#     - job-spec: "vhost-00"
+#       build: "34"
+#     - job-spec: "vhost-01"
+#       build: "35"
 
 # VPP Latency Changes 3n-skx 2t1c
 - type: "table"
@@ -5737,7 +5735,7 @@
 - type: "table"
   title: "Detailed Test Results - DPDK Performance Results 2n-zn2"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_zn2"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,ZN2]}/dpdk_performance_results_2n_zn2"
   columns:
     - title: " |prein| Test Name |preout| "
       data: "data name"
@@ -5819,36 +5817,18 @@
   - "parent"
   - "msg"
 
-# # Detailed Test Results - DPDK Performance Results 2n-tx2
-# - type: "table"
-#   title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
-#   algorithm: "table_merged_details"
-#   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}/dpdk_performance_results_2n_tx2"
-#   columns:
-#     - title: " |prein| Test Name |preout| "
-#       data: "data name"
-#     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-#       data: "data msg"
-#   data: "dpdk-2n-tx2-curr-iter-best"
-#   filter: "all"
-#   parameters:
-#   - "name"
-#   - "parent"
-#   - "msg"
-
-# Detailed Test Results - TRex Performance Results 3n-skx
+# Detailed Test Results - DPDK Performance Results 2n-tx2
 - type: "table"
-  title: "Detailed Test Results - TRex Performance Results 3n-skx"
+  title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
   algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,TREX,3N,SKX]}/trex_performance_results_3n_skx"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}/dpdk_performance_results_2n_tx2"
   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-3n-skx-curr-iter-best"
+  data: "dpdk-2n-tx2-curr-iter-best"
   filter: "all"
-  remove-ndr: False
   parameters:
   - "name"
   - "parent"
@@ -5864,7 +5844,7 @@
       data: "data name"
     - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
       data: "data msg"
-  data: "trex-2n-skx-curr-iter-best"
+  data: "trex-2n-skx-curr-cov"
   filter: "all"
   remove-ndr: False
   parameters:
@@ -5947,7 +5927,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
-      - "nitro50g"
+      - "ena"
 
 # VPP Performance Configuration
 - type: "file"
@@ -6020,7 +6000,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
-      - "nitro50g"
+      - "ena"
 
 # VPP Performance Operational
 - type: "file"
@@ -6093,7 +6073,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
-      - "aws"
+      - "ena"
 
 # VPP MRR Results
 - type: "file"
@@ -6166,7 +6146,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
-      - "nitro50g"
+      - "ena"
 
 # VPP MRR Configuration
 - type: "file"
@@ -6239,7 +6219,7 @@
       - "cx556a"
       - "vic1227"
       - "vic1385"
-      - "nitro50g"
+      - "ena"
 
 # VPP Device Results - Ubuntu
 - type: "file"
@@ -6331,23 +6311,13 @@
   filter: "all"
   data-start-level: 4
 
-# # DPDK Performance Results 2n-tx2
-# - type: "file"
-#   title: "DPDK Performance Results 2n-tx2"
-#   algorithm: "file_test_results"
-#   output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-#   dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
-#   data: "dpdk-2n-tx2-curr-iter-best"
-#   filter: "all"
-#   data-start-level: 4
-
-# TRex Performance Results 3n-skx
+# DPDK Performance Results 2n-tx2
 - type: "file"
-  title: "TRex Performance Results 3n-skx"
+  title: "DPDK Performance Results 2n-tx2"
   algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,TREX,3N,SKX]}"
-  dir-tables: "{DIR[DTR,PERF,TREX,3N,SKX]}"
-  data: "trex-3n-skx-curr-iter-best"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
+  data: "dpdk-2n-tx2-curr-iter-best"
   filter: "all"
   data-start-level: 4
 
@@ -6357,7 +6327,7 @@
   algorithm: "file_test_results"
   output-file: "{DIR[DTR,PERF,TREX,2N,SKX]}"
   dir-tables: "{DIR[DTR,PERF,TREX,2N,SKX]}"
-  data: "trex-2n-skx-curr-iter-best"
+  data: "trex-2n-skx-curr-cov"
   filter: "all"
   data-start-level: 4
 
@@ -6368,99 +6338,91 @@
 # VSAP tests 2n-clx
 
 - type: "plot"
-  title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
+    - "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"
   layout:
-    title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
+    - "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"
   layout:
-    title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
+    - "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"
   layout:
-    title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-cps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-Cps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-cps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-Cps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-cps"
+    - "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"
   layout:
-    title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.0B-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
+    - "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-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.64b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
+    - "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-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
+    - "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-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 - type: "plot"
-  title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-rps"
   data: "vpp-2n-clx-curr-iter-vsap"
   include:
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.14.2-rps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.14.2-rps"
-    - "Tests.Vpp.Perf.Hoststack.2N1L-100Ge2P1E810Cq-Eth-Ip4Tcphttp-Ldpreload-Nginx-1.15.0-rps.2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx-1.15.0-rps"
+    - "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-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+    title: "2n-clx-cx556a-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
     layout: "plot-hoststack"
 
 # Hoststack tests 3n-skx
@@ -7436,9 +7398,6 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Base-Ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-{core}-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Dot1Q-Ip4Base-Ndrpdr.64B-{core}-af-xdp-dot1q-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Base-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-af-xdp-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-{core}-af-xdp-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-{core}-ip4routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
@@ -7468,7 +7427,7 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
   layout:
     title: "2n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
@@ -7481,11 +7440,24 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.1518b-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2n1l-50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.1518b-{core}-ethip4-ip4scale20k-ndrpdr"
   layout:
     title: "2n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-{test_type}"
+  data: "vpp-2n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6base-ndrpdr.1518B-{core}-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2n1l-50ge1p1ENA-ethip6-ip6scale20k-ndrpdr.1518B-{core}-ethip6-ip6scale20k-ndrpdr"
+  layout:
+    title: "2n-aws-nitro50g-1518b-{core}-ip6routing-base-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -7494,7 +7466,7 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-ndrpdr.64B-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.64B-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.64B-{core}-ethip4-ip4scale20k-ndrpdr"
   layout:
     title: "3n-aws-nitro50g-64b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
@@ -7507,11 +7479,35 @@
   core: ["2t1c", ]
   include:
     - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4base-ndrpdr.1518b-{core}-ethip4-ip4base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale2m-ndrpdr.1518b-{core}-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.50ge1p1ENA-ethip4-ip4scale20k-ndrpdr.1518b-{core}-ethip4-ip4scale20k-ndrpdr"
   layout:
     title: "3n-aws-nitro50g-1518b-{core}-ip4routing-base-scale-ena-{test_type}"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.50ge1p1ENA-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.1518B-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-aws-nitro50g-1518b-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-{test_type}"
+  data: "vpp-3n-aws-curr-iter"
+  core: ["2t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Crypto.50ge1p1ENA-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.imix-{core}-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr"
+  layout:
+    title: "3n-aws-nitro50g-imix-{core}-ipsec-ip4routing-scale-ena-{test_type}"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-skx-xxv710-64b-{core}-ip4tunnel-base-[avf,dpdk]-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -7697,9 +7693,6 @@
   include:
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Base-Ndrpdr.78B-{core}-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Base-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6base-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Scale20K-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-ndrpdr"
-    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X553-af-xdp-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-{core}-af-xdp-ethip6-ip6scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
@@ -8081,21 +8074,6 @@
     title: "2n-dnv-x553-64b-{core}-l2switching-base-scale-ixgbe-{test_type}"
     layout: "plot-throughput"
 
-- type: "plot"
-  title: "Throughput: 2n-dnv-x553-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
-  data: "vpp-2n-dnv-curr-iter"
-  core: ["1t1c", ]
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Patch-Ndrpdr.64B-{core}-af-xdp-eth-l2patch-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Xcbase-Ndrpdr.64B-{core}-af-xdp-eth-l2xcbase-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Bdbasemaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-af-xdp-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-{core}-af-xdp-eth-l2bdscale10kmaclrn-ndrpdr"
-  layout:
-    title: "2n-dnv-x553-64b-{core}-l2switching-base-scale-af_xdp-{test_type}"
-    layout: "plot-throughput"
-
 - type: "plot"
   title: "Throughput: 3n-dnv-x553-64b-{core}-l2switching-base-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
@@ -9871,18 +9849,18 @@
 
 # 2n-tx2-xl710
 
-# - type: "plot"
-#   title: "DPDK Throughput: 2n-tx2-xl710-64b-{core}-base-{test_type}"
-#   algorithm: "plot_ndrpdr_box_name"
-#   output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-{core}-base-{test_type}"
-#   data: "dpdk-2n-tx2-curr-iter"
-#   core: ["1t1c", "2t2c"]
-#   include:
-#     - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
-#     - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
-#   layout:
-#     title: "2n-tx2-xl710-64b-{core}-base-{test_type}"
-#     layout: "plot-throughput"
+- type: "plot"
+  title: "DPDK Throughput: 2n-tx2-xl710-64b-{core}-base-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-{core}-base-{test_type}"
+  data: "dpdk-2n-tx2-curr-iter"
+  core: ["1t1c", "2t2c"]
+  include:
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-{core}-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-{core}-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-{core}-base-{test_type}"
+    layout: "plot-throughput"
 
 ################################################################################
 ###   2n-clx                                                                 ###
@@ -12750,17 +12728,6 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
-- type: "plot"
-  title: "Latency by percentile: TRex 3n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile_x_log"
-  output-file: "{DIR[STATIC,TREX]}/hdrh-lat-percentile-3n-skx"
-  output-file-links: "{DIR[LAT,TREX]}/3n_skx.rst"
-  target-links: "../../_static/trex"
-  data: "trex-3n-skx-curr-iter-best"
-  filter: "'NIC_Intel-X710'"
-  layout:
-    layout: "plot-hdrh-latency-percentile-x-log"
-
 - type: "plot"
   title: "Latency by percentile: 2n-clx"
   algorithm: "plot_hdrh_lat_by_percentile_x_log"
@@ -12904,16 +12871,16 @@
   layout:
     layout: "plot-hdrh-latency-percentile-x-log"
 
-# - type: "plot"
-#   title: "Latency by percentile: DPDK 2n-tx2"
-#   algorithm: "plot_hdrh_lat_by_percentile_x_log"
-#   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
-#   output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
-#   target-links: "../../_static/dpdk"
-#   data: "dpdk-2n-tx2-curr-iter-best"
-#   filter: "'1T1C' and 'NIC_Intel-XL710'"
-#   layout:
-#     layout: "plot-hdrh-latency-percentile-x-log"
+- type: "plot"
+  title: "Latency by percentile: DPDK 2n-tx2"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
+  output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
+  target-links: "../../_static/dpdk"
+  data: "dpdk-2n-tx2-curr-iter-best"
+  filter: "'1T1C' and 'NIC_Intel-XL710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 ###############################################################################
 
@@ -12966,76 +12933,6 @@
 
 ###############################################################################
 
-# TRex 3n-skx
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-64b--ip4-base-scale-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-64b--ip4-base-scale-{test_type}"
-  data: "trex-3n-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: "3n-skx-x710-64b--ip4-base-scale-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-  data: "trex-3n-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: "3n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-  data: "trex-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
-    - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-78b--ip6-base-scale-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-78b--ip6-base-scale-{test_type}"
-  data: "trex-3n-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: "3n-skx-x710-78b--ip6-base-scale-{test_type}"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "Throughput: 3n-skx-x710-64b--l2-scale-{test_type}"
-  algorithm: "plot_ndrpdr_box_name"
-  output-file: "{DIR[STATIC,TREX]}/3n-skx-x710-64b--l2-scale-{test_type}"
-  data: "trex-3n-skx-curr-iter"
-  core: ["2t1c", ]
-  include:
-    - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
-  layout:
-    title: "3n-skx-x710-64b--l2-scale-{test_type}"
-    layout: "plot-throughput"
-
 # TRex 2n-skx
 
 - type: "plot"