Report: Add rc1 and re-test data

Change-Id: Ibff3baad0c50bff67090edd62a1b487e68a8b2ec
Signed-off-by: Tibor Frank <tifrank@cisco.com>

2 files changed, 661 insertions, 672 deletions

diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index 2e612185ae..7ef0706b96 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -42,6 +42,12 @@
   vpp-3n-skx-prev-iter-new-env:
     csit-vpp-perf-report-iterative-2110-3n-skx:
       - 17  # rls2106.rel NDRPDR iter env 8
+      - 19  # rls2106.rel NDRPDR iter env 8
+      - 20  # rls2106.rel NDRPDR iter env 8
+      - 21  # rls2106.rel NDRPDR iter env 8
+      - 25  # rls2106.rel NDRPDR iter env 8
+      - 26  # rls2106.rel NDRPDR iter env 8
+      - 27  # rls2106.rel NDRPDR iter env 8
 
   vpp-3n-skx-curr-iter:
     csit-vpp-perf-report-iterative-2110-3n-skx:
@@ -68,19 +74,16 @@
       - 8   # rls2110.rc1 MRR iter env 8
 
   vpp-3n-skx-curr-iter-hoststack:
-    # csit-vpp-perf-report-iterative-2110-3n-skx:
-    csit-vpp-perf-report-iterative-2106-3n-skx:
-      - 39  # rls2106.rel NDRPDR iter env 7
+    csit-vpp-perf-report-iterative-2110-3n-skx:
+      - 23  # rls2110.rel NDRPDR iter env 8
 
   trex-3n-skx-curr-iter:
     csit-trex-perf-report-iterative-2110-3n-skx:
       - 1   # rls2110.rc1 NDRPDR iter env 8 - REMOVE
-#       - 2   # rls2110.rc1 NDRPDR iter env 8
 
   trex-3n-skx-curr-iter-best:
     csit-trex-perf-report-iterative-2110-3n-skx:
       - 1   # rls2110.rc1 NDRPDR iter env 8 - REMOVE
-#       - 2   # rls2110.rc1 NDRPDR iter env 8
 
   vpp-3n-skx-curr-cov:
     # csit-vpp-perf-report-coverage-2110-3n-skx:
@@ -118,6 +121,11 @@
       - 7   # rls2110 NDRPDR iter env 8
       - 8   # rls2110 NDRPDR iter env 8
       - 10  # rls2110 NDRPDR iter env 8
+      - 16  # rls2110 NDRPDR iter env 8
+      - 17  # rls2110 NDRPDR iter env 8
+      - 18  # rls2110 NDRPDR iter env 8
+      - 19  # rls2110 NDRPDR iter env 8
+      - 21  # rls2110 NDRPDR iter env 8
 
   dpdk-3n-skx-curr-iter-best:
     csit-dpdk-perf-report-iterative-2110-3n-skx:
@@ -185,16 +193,23 @@
   vpp-2n-skx-prev-iter-new-env:
     csit-vpp-perf-report-iterative-2110-2n-skx:
       - 33  # rls2106.rel NDRPDR iter env 8
+      - 34  # rls2106.rel NDRPDR iter env 8
       - 35  # rls2106.rel NDRPDR iter env 8
+      - 36  # rls2106.rel NDRPDR iter env 8
       - 37  # rls2106.rel NDRPDR iter env 8
+      - 44  # rls2106.rel NDRPDR iter env 8
+      - 45  # rls2106.rel NDRPDR iter env 8
+      - 46  # rls2106.rel NDRPDR iter env 8
+      - 48  # rls2106.rel NDRPDR iter env 8
+      - 49  # rls2106.rel NDRPDR iter env 8
 
   vpp-2n-skx-curr-iter:
     csit-vpp-perf-report-iterative-2110-2n-skx:
-      - 2   # rls2110.rc1 NDRPDR iter env 8
+      - 40  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-skx-curr-iter-best:
     csit-vpp-perf-report-iterative-2110-2n-skx:
-      - 2   # rls2110.rc1 NDRPDR iter env 8
+      - 40  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-skx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-skx:
@@ -222,57 +237,31 @@
       - 2   # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-skx-curr-soak:
-    # csit-vpp-perf-report-iterative-2110-2n-skx:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 58  # rls2106.rel soak env 7
-      - 64  # rls2106.rel soak env 7
+    csit-vpp-perf-report-iterative-2110-2n-skx:
+      - 43  # rls2110.rc1 soak env 8
   vpp-soak-vs-ndr-2n-skx-ref:
-    # csit-vpp-perf-report-iterative-2110-2n-skx:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 59  # rls2106.rel NDRPDR iter env 7
-      - 60  # rls2106.rel NDRPDR iter env 7
-      - 61  # rls2106.rel NDRPDR iter env 7
-      - 65  # rls2106.rel NDRPDR iter env 7
-      - 66  # rls2106.rel NDRPDR iter env 7
-      - 67  # rls2106.rel NDRPDR iter env 7
-      - 68  # rls2106.rel NDRPDR iter env 7
-      - 69  # rls2106.rel NDRPDR iter env 7
-      - 70  # rls2106.rel NDRPDR iter env 7
-      - 71  # rls2106.rel NDRPDR iter env 7
+    csit-vpp-perf-report-iterative-2110-2n-skx:
+      - 40  # rls2110.rc1 NDRPDR iter env 8
   vpp-soak-vs-ndr-2n-skx:
-    # csit-vpp-perf-report-iterative-2110-2n-skx:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 59  # rls2106.rel NDRPDR iter env 7
-      - 60  # rls2106.rel NDRPDR iter env 7
-      - 61  # rls2106.rel NDRPDR iter env 7
-      - 65  # rls2106.rel NDRPDR iter env 7
-      - 66  # rls2106.rel NDRPDR iter env 7
-      - 67  # rls2106.rel NDRPDR iter env 7
-      - 68  # rls2106.rel NDRPDR iter env 7
-      - 69  # rls2106.rel NDRPDR iter env 7
-      - 70  # rls2106.rel NDRPDR iter env 7
-      - 71  # rls2106.rel NDRPDR iter env 7
-      - 58  # rls2106.rel soak env 7
-      - 64  # rls2106.rel soak env 7
+    csit-vpp-perf-report-iterative-2110-2n-skx:
+      - 40  # rls2110.rc1 NDRPDR iter env 8
+      - 43  # rls2110.rc1 soak env 8
 
   vpp-2n-skx-curr-nfv-ndrpdr:
     csit-vpp-perf-report-iterative-2110-2n-skx:
       - 41  # rls2110.rc1 NDRPDR nf-density iter env 8
 
   vpp-2n-skx-curr-nfv-mrr:
-    # csit-vpp-perf-report-iterative-2110-2n-skx:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 53  # rls2106.rel MRR nf-density iter env 7
+    csit-vpp-perf-report-iterative-2110-2n-skx:
+      - 38  # rls2110.rc1 MRR nf-density iter env 8
 
   vpp-2n-skx-curr-nfv-reconf:
-    # csit-vpp-perf-report-iterative-2110-2n-skx:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 54  # rls2106.rel NDRPDR reconf iter env 7
+    csit-vpp-perf-report-iterative-2110-2n-skx:
+      - 42  # rls2110.rc1 NDRPDR reconf iter env 8
 
   vpp-2n-skx-curr-gso:
-    # csit-vpp-perf-report-iterative-2110-2n-skx:
-    csit-vpp-perf-report-iterative-2106-2n-skx:
-      - 55  # rls2106.rel MRR GSO iter env 7
+    csit-vpp-perf-report-iterative-2110-2n-skx:
+      - 47  # rls2110.rc1 MRR GSO iter env 8
 
   vpp-2n-skx-curr-cov:
     # csit-vpp-perf-report-coverage-2110-2n-skx:
@@ -374,19 +363,20 @@
   vpp-2n-zn2-prev-iter-new-env:
     csit-vpp-perf-report-iterative-2110-2n-zn2:
       - 20  # rls2106.rel NDRPDR iter env 8
+      - 21  # rls2106.rel NDRPDR iter env 8
+      - 22  # rls2106.rel NDRPDR iter env 8
 
   vpp-2n-zn2-curr-iter:
     csit-vpp-perf-report-iterative-2110-2n-zn2:
-      - 2   # rls2110.rc1 NDRPDR iter env 8
+      - 26  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-zn2-curr-iter-best:
     csit-vpp-perf-report-iterative-2110-2n-zn2:
-      - 2   # rls2110.rc1 NDRPDR iter env 8
+      - 26  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-zn2-curr-iter-gso:
-    # csit-vpp-perf-report-iterative-2110-2n-zn2:
-    csit-vpp-perf-report-iterative-2106-2n-zn2:
-      - 37  # rls2106.rel MRR GSO iter env 7
+    csit-vpp-perf-report-iterative-2110-2n-zn2:
+      - 32  # rls2110.rc1 MRR GSO iter env 8
 
   vpp-2n-zn2-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-zn2:
@@ -442,6 +432,7 @@
       - 25  # rls2110 NDRPDR iter env 8
       - 26  # rls2110 NDRPDR iter env 8
       - 29  # rls2110 NDRPDR iter env 8
+      - 30  # rls2110 NDRPDR iter env 8
 
   dpdk-2n-zn2-curr-iter-best:
     csit-dpdk-perf-report-iterative-2110-2n-zn2:
@@ -493,7 +484,6 @@
       - 132 # rls2101.rel NDRPDR iter MLX env 6
 
   vpp-2n-clx-prev-iter-old-env:
-    csit-vpp-perf-report-iterative-2101-2n-clx:
     csit-vpp-perf-report-iterative-2106-2n-clx:
       - 75  # rls2106.rel NDRPDR iter env 7
       - 76  # rls2106.rel NDRPDR iter env 7
@@ -519,16 +509,22 @@
 
   vpp-2n-clx-prev-iter-new-env:
     csit-vpp-perf-report-iterative-2110-2n-clx:
+      - 17  # rls2106.rel NDRPDR iter env 8
       - 18  # rls2106.rel NDRPDR iter env 8
       - 19  # rls2106.rel NDRPDR iter env 8
+      - 20  # rls2106.rel NDRPDR iter env 8
+      - 21  # rls2106.rel NDRPDR iter env 8
+      - 30  # rls2106.rel NDRPDR iter env 8
+      - 31  # rls2106.rel NDRPDR iter env 8
+      - 34  # rls2106.rel NDRPDR iter env 8
 
   vpp-2n-clx-curr-iter:
     csit-vpp-perf-report-iterative-2110-2n-clx:
-      - 2   # rls2110.rc1 NDRPDR iter env 8
+      - 24  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-clx-curr-iter-best:
     csit-vpp-perf-report-iterative-2110-2n-clx:
-      - 2   # rls2110.rc1 NDRPDR iter env 8
+      - 24  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-clx-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-clx:
@@ -553,15 +549,13 @@
     csit-vpp-perf-report-iterative-2106-2n-clx:
       - 70  # rls2106.rel MRR GSO iter env 7
 
-  vpp-2n-clx-curr-iter-vsap:
-    # csit-vpp-perf-report-iterative-2110-2n-clx:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 74  # rls2106.rel VSAP iter env 7
+#   vpp-2n-clx-curr-iter-vsap:
+#     csit-vpp-perf-report-iterative-2110-2n-clx:
+#       - 28  # rls2110.rc1 VSAP iter env 8
 
   vpp-2n-clx-curr-nfv-ndrpdr:
-    # csit-vpp-perf-report-iterative-2110-2n-clx:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 71  # rls2106.rel NDRPDR nf-density iter env 7
+    csit-vpp-perf-report-iterative-2110-2n-clx:
+      - 25  # rls2110.rc1 NDRPDR nf-density iter env 8
 
   vpp-2n-clx-curr-nfv-mrr:
     csit-vpp-perf-report-iterative-2110-2n-clx:
@@ -572,38 +566,15 @@
       - 26  # rls2110.rc1 NDRPDR reconf iter env 8
 
   vpp-2n-clx-curr-soak:
-    # csit-vpp-perf-report-iterative-2110-2n-clx:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 73  # rls2106.rel soak env 7
-      - 80  # rls2106.rel soak env 7
+    csit-vpp-perf-report-iterative-2110-2n-clx:
+      - 27  # rls2110.rc1 soak env 8
   vpp-soak-vs-ndr-2n-clx-ref:
-    # csit-vpp-perf-report-iterative-2110-2n-clx:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 75  # rls2106.rel NDRPDR iter env 7
-      - 76  # rls2106.rel NDRPDR iter env 7
-      - 77  # rls2106.rel NDRPDR iter env 7
-      - 82  # rls2106.rel NDRPDR iter env 7
-      - 83  # rls2106.rel NDRPDR iter env 7
-      - 84  # rls2106.rel NDRPDR iter env 7
-      - 85  # rls2106.rel NDRPDR iter env 7
-      - 86  # rls2106.rel NDRPDR iter env 7
-      - 87  # rls2106.rel NDRPDR iter env 7
-      - 88  # rls2106.rel NDRPDR iter env 7
+    csit-vpp-perf-report-iterative-2110-2n-clx:
+      - 24  # rls2110.rc1 NDRPDR iter env 8
   vpp-soak-vs-ndr-2n-clx:
-    # csit-vpp-perf-report-iterative-2110-2n-clx:
-    csit-vpp-perf-report-iterative-2106-2n-clx:
-      - 75  # rls2106.rel NDRPDR iter env 7
-      - 76  # rls2106.rel NDRPDR iter env 7
-      - 77  # rls2106.rel NDRPDR iter env 7
-      - 82  # rls2106.rel NDRPDR iter env 7
-      - 83  # rls2106.rel NDRPDR iter env 7
-      - 84  # rls2106.rel NDRPDR iter env 7
-      - 85  # rls2106.rel NDRPDR iter env 7
-      - 86  # rls2106.rel NDRPDR iter env 7
-      - 87  # rls2106.rel NDRPDR iter env 7
-      - 88  # rls2106.rel NDRPDR iter env 7
-      - 73  # rls2106.rel soak env 7
-      - 80  # rls2106.rel soak env 7
+    csit-vpp-perf-report-iterative-2110-2n-clx:
+      - 24  # rls2110.rc1 NDRPDR iter env 8
+      - 27  # rls2110.rc1 soak env 8
 
   vpp-2n-clx-curr-cov:
     #  csit-vpp-perf-report-coverage-2110-2n-clx:
@@ -678,16 +649,19 @@
 
   vpp-3n-tsh-prev-iter-new-env:
     csit-vpp-perf-report-iterative-2110-3n-tsh:
+      - 12  # rls2106.rel NDRPDR iter env 8
+      - 13  # rls2106.rel NDRPDR iter env 8
       - 14  # rls2106.rel NDRPDR iter env 8
+      - 18  # rls2106.rel NDRPDR iter env 8
+      - 19  # rls2106.rel NDRPDR iter env 8
 
   vpp-3n-tsh-curr-iter:
-    # TODO: Replace
     csit-vpp-perf-report-iterative-2110-3n-tsh:
-      - 2   # rls2110.rc1 NDRPDR iter env 8
+      - 17  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-3n-tsh-curr-iter-best:
     csit-vpp-perf-report-iterative-2110-3n-tsh:
-      - 2   # rls2110.rc1 NDRPDR iter env 8
+      - 17  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-3n-tsh-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-3n-tsh:
@@ -739,6 +713,7 @@
   dpdk-3n-tsh-curr-iter:
     csit-dpdk-perf-report-iterative-2110-3n-tsh:
       - 12  # rls2110 NDRPDR iter env 8
+      - 14  # rls2110 NDRPDR iter env 8
       - 15  # rls2110 NDRPDR iter env 8
 
   dpdk-3n-tsh-curr-iter-best:
@@ -778,14 +753,17 @@
     csit-vpp-perf-report-iterative-2110-2n-tx2:
       - 17  # rls2106.rel NDRPDR iter env 8
       - 18  # rls2106.rel NDRPDR iter env 8
+      - 19  # rls2106.rel NDRPDR iter env 8
+      - 24  # rls2106.rel NDRPDR iter env 8
+      - 25  # rls2106.rel NDRPDR iter env 8
 
   vpp-2n-tx2-curr-iter:
     csit-vpp-perf-report-iterative-2110-2n-tx2:
-      - 3   # rls2110.rc1 NDRPDR iter env 8
+      - 23  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-tx2-curr-iter-best:
     csit-vpp-perf-report-iterative-2110-2n-tx2:
-      - 3   # rls2110.rc1 NDRPDR iter env 8
+      - 23  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-2n-tx2-hist-iter-mrr-new-env:
     csit-vpp-perf-report-iterative-2101-2n-tx2:
@@ -794,13 +772,11 @@
   vpp-2n-tx2-prev-iter-mrr-old-env:
     csit-vpp-perf-report-iterative-2106-2n-tx2:
       - 18  # rls2106.rel MRR iter env 7
-      - 29  # rls2101.rel MRR AF-XDP iter env 7
+      - 29  # rls2106.rel MRR AF-XDP iter env 7
 
   vpp-2n-tx2-prev-iter-mrr-new-env:
-    # TODO: Replace
-    # csit-vpp-perf-report-iterative-2106-2n-tx2:
-    csit-vpp-perf-report-iterative-2101-2n-tx2:
-      - 21  # rls2101.rel MRR iter env 6
+    csit-vpp-perf-report-iterative-2110-2n-tx2:
+      - 16  # rls2106.rel MRR iter env 8
 
   vpp-2n-tx2-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2110-2n-tx2:
@@ -813,7 +789,10 @@
 
   dpdk-2n-tx2-curr-iter:
     csit-dpdk-perf-report-iterative-2110-2n-tx2:
+      - 14  # rls2110 NDRPDR iter env 8
+      - 16  # rls2110 NDRPDR iter env 8
       - 18  # rls2110 NDRPDR iter env 8
+      - 19  # rls2110 NDRPDR iter env 8
 
   dpdk-2n-tx2-curr-iter-best:
     csit-dpdk-perf-report-iterative-2110-2n-tx2:
@@ -868,6 +847,7 @@
       - 23  # rls2106.rel NDRPDR iter env 8
       - 24  # rls2106.rel NDRPDR iter env 8
       - 25  # rls2106.rel NDRPDR iter env 8
+      - 26  # rls2106.rel NDRPDR iter env 8
 
   vpp-3n-dnv-curr-iter:
     csit-vpp-perf-report-iterative-2110-3n-dnv:
@@ -1025,6 +1005,10 @@
       - 4   # rls2110.rc1 NDRPDR iter env 8
       - 5   # rls2110.rc1 NDRPDR iter env 8
 
+  vpp-2n-aws-curr-iter-best:
+    csit-vpp-perf-report-iterative-2110-2n-aws:
+      - 5   # rls2110.rc1 NDRPDR iter env 8
+
   vpp-2n-aws-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2110-2n-aws:
       - 2   # rls2110.rc1 MRR iter env 8
@@ -1032,13 +1016,18 @@
   vpp-2n-aws-curr-cov:
     # csit-vpp-perf-report-coverage-2110-2n-aws:
     csit-vpp-perf-report-iterative-2110-2n-aws:
-      - 2   # rls2110.rc1 MRR iter env 8
+      - 5   # rls2110.rc1 MRR iter env 8
 
   # 3n-aws
 
   vpp-3n-aws-curr-iter:
     csit-vpp-perf-report-iterative-2110-3n-aws:
       - 4   # rls2110.rc1 NDRPDR iter env 8
+      - 11  # rls2110.rc1 NDRPDR iter env 8
+
+  vpp-3n-aws-curr-iter-best:
+    csit-vpp-perf-report-iterative-2110-3n-aws:
+      - 11  # rls2110.rc1 NDRPDR iter env 8
 
   vpp-3n-aws-curr-iter-mrr:
     csit-vpp-perf-report-iterative-2110-3n-aws:
@@ -1047,7 +1036,7 @@
   vpp-3n-aws-curr-cov:
     # csit-vpp-perf-report-coverage-2110-3n-aws:
     csit-vpp-perf-report-iterative-2110-3n-aws:
-      - 4   # rls2110.rc1 NDRPDR iter env 8
+      - 11  # rls2110.rc1 NDRPDR iter env 8
 
   # 2n-icx
 
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index 2abc567112..fc7df76568 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,84 @@
       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"
+#     - 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 +455,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"
@@ -5819,41 +5819,41 @@
   - "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"
   - "msg"
 
+# # Detailed Test Results - TRex Performance Results 3n-skx
+# - type: "table"
+#   title: "Detailed Test Results - TRex Performance Results 3n-skx"
+#   algorithm: "table_merged_details"
+#   output-file: "{DIR[DTR,PERF,TREX,3N,SKX]}/trex_performance_results_3n_skx"
+#   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"
+#   filter: "all"
+#   remove-ndr: False
+#   parameters:
+#   - "name"
+#   - "parent"
+#   - "msg"
+
 # Detailed Test Results - TRex Performance Results 2n-skx
 - type: "table"
   title: "Detailed Test Results - TRex Performance Results 2n-skx"
@@ -6331,26 +6331,26 @@
   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
 
+# # TRex Performance Results 3n-skx
+# - type: "file"
+#   title: "TRex Performance Results 3n-skx"
+#   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"
+#   filter: "all"
+#   data-start-level: 4
+
 # TRex Performance Results 2n-skx
 - type: "file"
   title: "TRex Performance Results 2n-skx"
@@ -6367,101 +6367,101 @@
 
 # VSAP tests 2n-clx
 
-- type: "plot"
-  title: "2n-clx-e810cg-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"
-  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"
-  layout:
-    title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-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"
-  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"
-  layout:
-    title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-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"
-  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"
-  layout:
-    title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-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"
-  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"
-  layout:
-    title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-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"
-  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"
-  layout:
-    title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-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"
-  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"
-  layout:
-    title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-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"
-  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"
-  layout:
-    title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "2n-clx-e810cg-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"
-  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"
-  layout:
-    title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
-    layout: "plot-hoststack"
+# - type: "plot"
+#   title: "2n-clx-e810cg-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"
+#   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"
+#   layout:
+#     title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-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"
+#   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"
+#   layout:
+#     title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-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"
+#   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"
+#   layout:
+#     title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-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"
+#   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"
+#   layout:
+#     title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-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"
+#   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"
+#   layout:
+#     title: "2n-clx-e810cg-0b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-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"
+#   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"
+#   layout:
+#     title: "2n-clx-e810cg-64b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-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"
+#   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"
+#   layout:
+#     title: "2n-clx-e810cg-1024b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
+#
+# - type: "plot"
+#   title: "2n-clx-e810cg-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"
+#   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"
+#   layout:
+#     title: "2n-clx-e810cg-2048b-2t1c-eth-ip4tcphttp-ldpreload-nginx"
+#     layout: "plot-hoststack"
 
 # Hoststack tests 3n-skx
 
@@ -9871,18 +9871,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,16 +12750,16 @@
   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: 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"
@@ -12904,16 +12904,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"
 
 ###############################################################################
 
@@ -12968,73 +12968,73 @@
 
 # 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"
+# - 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