X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=20c0cceb73e4982ef3c6bdeecb1e818fed65d11d;hb=7bcc61b0ab7fb4dd46fd38e361df6ef8aa8e181b;hp=269b9c73d16b2936632918280c6a5780277926b4;hpb=3b0487f89bca5796c1703659f8a4a423e3aa5f86;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 269b9c73d1..20c0cceb73 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -153,12 +153,12 @@
     plot-vpp-throughput-lat-tsa-3n-hsw:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-vpp-hdrh-lat-3n-hsw:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-vpp-hoststack-3n-hsw:
       # TODO: Replace:
@@ -179,24 +179,24 @@
     plot-dpdk-throughput-latency-3n-hsw:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-dpdk-hdrh-lat-3n-hsw:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-vpp-hdrh-lat-3n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-vpp-nfv-3n-skx-ndrpdr:
       # TODO: Replace:
@@ -217,24 +217,24 @@
     plot-dpdk-throughput-latency-3n-skx:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-dpdk-hdrh-lat-3n-skx:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-vpp-hdrh-lat-2n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-vpp-soak-2n-skx:
       # TODO: Replace:
@@ -282,24 +282,24 @@
     plot-dpdk-throughput-latency-2n-skx:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-dpdk-hdrh-lat-2n-skx:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     # 2n-clx
 
     plot-vpp-throughput-lat-tsa-2n-clx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-vpp-hdrh-lat-2n-clx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-vpp-nfv-2n-clx-ndrpdr:
       # TODO: Replace:
@@ -347,12 +347,12 @@
     plot-dpdk-throughput-latency-2n-clx:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     plot-dpdk-hdrh-lat-2n-clx:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     # 3n-tsh
 
@@ -380,12 +380,12 @@
     plot-dpdk-throughput-latency-3n-tsh:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1  # RC1 NDRPDR sel env 4
+        - 1  # RC1 NDRPDR sel env5
 
     plot-dpdk-hdrh-lat-3n-tsh:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1  # RC1 NDRPDR sel env 4
+        - 1  # RC1 NDRPDR sel env5
 
     # 3n-dnv
 
@@ -459,12 +459,12 @@
     vpp-nic-comparison-3n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-nic-comparison-2n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-nic-comparison-3n-skx-mrr:
       # TODO: Replace:
@@ -483,131 +483,32 @@
     vpp-perf-results-3n-hsw:
       # TODO: Replace:
       # csit-vpp-perf-report-coverage-2009-3n-hsw:
-      csit-vpp-perf-report-coverage-2005-3n-hsw:
-        - 74  # crypto-00
-        - 75  # crypto-01
-        - 76  # crypto-02
-        - 77  # crypto-03
-        - 78  # ip4-00
-        - 79  # ip4-01
-        - 80  # ip4-02
-        - 81  # ip4-03
-        - 73  # ip4-04
-        - 82  # ip4-05
-        - 83  # ip4-06
-        - 84  # ip4-07
-        - 85  # ip4-08
-        - 86  # ip4tun-00
-        - 87  # ip4tun-01
-        - 88  # ip4tun-02
-        - 89  # ip6-00
-        - 90  # ip6-01
-        - 91  # ip6tun-00
-        - 92  # l2-00
-        - 93  # l2-01
-        - 94  # l2-02
-        - 95  # l2-03
-        - 96  # l2-04
-        - 97  # l2-05
-        - 98  # l2-06
-        - 99  # l2-07
-        - 100 # l2-08
-        - 101 # l2-09
-        - 102 # l2-10
-        - 103 # memif-00
-        - 104 # srv6-00
-        - 105 # srv6-01
-        - 106 # vhost-00
-        - 107 # vhost-01
-        - 109 # vhost-02
+      csit-vpp-perf-report-iterative-2009-3n-hsw:
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-perf-results-3n-skx:
       # TODO: Replace:
       # csit-vpp-perf-report-coverage-2009-3n-skx:
-      csit-vpp-perf-report-coverage-2005-3n-skx:
-        - 45  # crypto-00
-        - 46  # crypto-01
-        - 47  # crypto-02
-        - 83  # crypto-03
-        - 50  # ip4-00
-        - 51  # ip4-01
-        - 52  # ip4-02
-        - 53  # ip4-03
-        - 54  # ip4-04
-        - 55  # ip4-05
-        - 56  # ip4-06
-        - 57  # ip4-07
-        - 58  # ip4-08
-        - 59  # ip4tun-00
-        - 60  # ip4tun-01
-        - 61  # ip4tun-02
-        - 62  # ip6-00
-        - 63  # ip6-01
-        - 64  # ip6tun-00
-        - 65  # l2-00
-        - 66  # l2-01
-        - 67  # l2-02
-        - 68  # l2-03
-        - 69  # l2-04
-        - 84  # l2-05
-        - 71  # l2-06
-        - 72  # l2-07
-        - 73  # l2-08
-        - 85  # l2-09
-        - 75  # l2-10
-        - 76  # memif-00
-        - 77  # srv6-00
-        - 78  # srv6-01
-        - 88  # vhost-00
-        - 89  # vhost-01
-        - 81  # vhost-02
-        - 83  # vhost-03
+      csit-vpp-perf-report-iterative-2009-3n-skx:
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-perf-results-2n-skx:
       # TODO: Replace:
       # csit-vpp-perf-report-coverage-2009-2n-skx:
-      csit-vpp-perf-report-coverage-2005-2n-skx:
-        - 28  # ip4-00
-        - 29  # ip4-01
-        - 30  # ip4-02
-        - 31  # ip4-03
-        - 32  # ip4-04
-        - 33  # ip4-05
-        - 34  # ip6-00
-        - 35  # ip6-01
-        - 36  # l2-00
-        - 37  # l2-01
-        - 38  # lb-00
-        - 39  # memif-00
-        - 40  # vhost-00
-        - 41  # vhost-01
-        - 42  # vts-00
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-perf-results-2n-clx:
       # TODO: Replace:
       # csit-vpp-perf-report-coverage-2009-2n-clx:
-      csit-vpp-perf-report-coverage-2005-2n-clx:
-        - 24  # ip4-00
-        - 25  # ip4-01
-        - 26  # ip4-02
-        - 27  # ip4-03
-        - 28  # ip4-04
-        - 29  # ip4-05
-        - 34  # ip6-00
-        - 36  # ip6-01
-        - 31  # l2-00
-        - 41  # l2-01
-        - 39  # lb-00
-        - 37  # memif-00
-        - 32  # vhost-00
-        - 33  # vhost-01
-        - 40  # vts-00
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-perf-results-3n-tsh:
       # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2009-3n-tsh:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 35  # NDRPDR sel env 4
+      # csit-vpp-perf-report-coverage-2009-3n-tsh:
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-perf-results-3n-dnv:
       # TODO: Replace:
@@ -684,19 +585,19 @@
 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-perf-results-2n-clx:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-perf-results-2n-dnv:
       # TODO: Replace:
@@ -712,7 +613,7 @@
 
     dpdk-perf-results-3n-tsh:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1  # RC1 NDRPDR sel env 4
+        - 1  # RC1 NDRPDR sel env5
 
 ###########################################################################
     # Tables (more than one data set)
@@ -743,7 +644,7 @@
     vpp-performance-changes-3n-hsw-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-performance-changes-3n-skx-h1:
       csit-vpp-perf-report-iterative-2005-3n-skx:
@@ -767,7 +668,7 @@
     vpp-performance-changes-3n-skx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-performance-changes-2n-skx-h1:
       csit-vpp-perf-report-iterative-2005-2n-skx:
@@ -792,7 +693,7 @@
     vpp-performance-changes-2n-skx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-performance-changes-2n-clx-h1:
       csit-vpp-perf-report-iterative-2005-2n-clx:
@@ -819,7 +720,7 @@
     vpp-performance-changes-2n-clx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-performance-changes-2n-dnv-h1:
       csit-vpp-perf-verify-2001-2n-dnv:
@@ -1136,7 +1037,7 @@
     dpdk-performance-changes-3n-hsw-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-performance-changes-3n-skx-h1:
       csit-dpdk-perf-verify-2001-3n-skx:
@@ -1175,7 +1076,7 @@
     dpdk-performance-changes-3n-skx-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-performance-changes-2n-skx-h1:
       csit-dpdk-perf-verify-2001-2n-skx:
@@ -1214,7 +1115,7 @@
     dpdk-performance-changes-2n-skx-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-performance-changes-2n-clx-h1:
       csit-dpdk-perf-verify-2001-2n-clx:
@@ -1253,7 +1154,7 @@
     dpdk-performance-changes-2n-clx-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-performance-changes-2n-dnv-h1:
       csit-dpdk-perf-verify-2001-2n-dnv:
@@ -1351,36 +1252,36 @@
     dpdk-performance-changes-3n-tsh-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1  # RC1 NDRPDR sel env 4
+        - 1  # RC1 NDRPDR sel env5
 
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
     vpp-compare-testbeds-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-compare-testbeds-skx-clx-ref:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
     vpp-compare-testbeds-skx-clx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-compare-testbeds-hsw-clx-ref:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
     vpp-compare-testbeds-hsw-clx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-compare-testbeds-mrr-ref:
       # TODO: Replace:
@@ -1418,31 +1319,31 @@
     dpdk-compare-testbeds-ref:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
     dpdk-compare-testbeds-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     dpdk-compare-testbeds-skx-clx-ref:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
     dpdk-compare-testbeds-skx-clx-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
     # Compare topologies
 
     vpp-compare-topologies-ref:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
     vpp-compare-topologies-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env4
+        - 3  # RC1 NDRPDR sel env5
 
     vpp-compare-topologies-mrr-ref:
       # TODO: Replace:
@@ -1458,11 +1359,11 @@
     dpdk-compare-topologies-ref:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
     dpdk-compare-topologies-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env 4
+        - 3  # RC1 NDRPDR sel env5
 
   plot-layouts:
 
@@ -2035,46 +1936,9 @@
       - 11  # hoststack
       - 12  # hoststack
       - 13  # hoststack
-    csit-vpp-perf-report-coverage-2005-3n-hsw:
-      - 74  # crypto-00
-      - 75  # crypto-01
-      - 76  # crypto-02
-      - 77  # crypto-03
-      - 78  # ip4-00
-      - 79  # ip4-01
-      - 80  # ip4-02
-      - 81  # ip4-03
-      - 73  # ip4-04
-      - 82  # ip4-05
-      - 83  # ip4-06
-      - 84  # ip4-07
-      - 85  # ip4-08
-      - 86  # ip4tun-00
-      - 87  # ip4tun-01
-      - 88  # ip4tun-02
-      - 89  # ip6-00
-      - 90  # ip6-01
-      - 91  # ip6tun-00
-      - 92  # l2-00
-      - 93  # l2-01
-      - 94  # l2-02
-      - 95  # l2-03
-      - 96  # l2-04
-      - 97  # l2-05
-      - 98  # l2-06
-      - 99  # l2-07
-      - 100 # l2-08
-      - 101 # l2-09
-      - 102 # l2-10
-      - 103 # memif-00
-      - 104 # srv6-00
-      - 105 # srv6-01
-      - 106 # vhost-00
-      - 107 # vhost-01
-      - 109 # vhost-02
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-3n-hsw:
-      - 3  # RC1 NDRPDR sel env 4
+      - 3  # RC1 NDRPDR sel env5
     # TODO: Add:
     # csit-vpp-perf-report-coverage-2009-3n-hsw:
 
@@ -2107,47 +1971,9 @@
       - 53  # NDRPDR sel 2001.0-4
       - 54  # NDRPDR sel 2001.0-4
       - 49  # MRR sel env 4
-    csit-vpp-perf-report-coverage-2005-3n-skx:
-      - 45  # crypto-00
-      - 46  # crypto-01
-      - 47  # crypto-02
-      - 83  # crypto-03
-      - 50  # ip4-00
-      - 51  # ip4-01
-      - 52  # ip4-02
-      - 53  # ip4-03
-      - 54  # ip4-04
-      - 55  # ip4-05
-      - 56  # ip4-06
-      - 57  # ip4-07
-      - 58  # ip4-08
-      - 59  # ip4tun-00
-      - 60  # ip4tun-01
-      - 61  # ip4tun-02
-      - 62  # ip6-00
-      - 63  # ip6-01
-      - 64  # ip6tun-00
-      - 65  # l2-00
-      - 66  # l2-01
-      - 67  # l2-02
-      - 68  # l2-03
-      - 69  # l2-04
-      - 84  # l2-05
-      - 71  # l2-06
-      - 72  # l2-07
-      - 73  # l2-08
-      - 85  # l2-09
-      - 75  # l2-10
-      - 76  # memif-00
-      - 77  # srv6-00
-      - 78  # srv6-01
-      - 88  # vhost-00
-      - 89  # vhost-01
-      - 81  # vhost-02
-      - 83  # vhost-03
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-3n-skx:
-      - 3  # RC1 NDRPDR sel env4
+      - 3  # RC1 NDRPDR sel env5
     # TODO: Add:
     # csit-vpp-perf-report-coverage-2009-3n-skx:
 
@@ -2195,25 +2021,9 @@
       - 136 # nf-density-sel env 4
       - 139 # nf-density-sel env 4
       - 115 # MRR nf-density-sel env 4
-    csit-vpp-perf-report-coverage-2005-2n-skx:
-      - 28  # ip4-00
-      - 29  # ip4-01
-      - 30  # ip4-02
-      - 31  # ip4-03
-      - 32  # ip4-04
-      - 33  # ip4-05
-      - 34  # ip6-00
-      - 35  # ip6-01
-      - 36  # l2-00
-      - 37  # l2-01
-      - 38  # lb-00
-      - 39  # memif-00
-      - 40  # vhost-00
-      - 41  # vhost-01
-      - 42  # vts-00
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-2n-skx:
-      - 3  # RC1 NDRPDR sel env4
+      - 3  # RC1 NDRPDR sel env5
     # TODO: Add:
     # csit-vpp-perf-report-coverage-2009-2n-skx:
 
@@ -2262,25 +2072,9 @@
       - 106 # nfv-density-00 env 4
       - 108 # nfv-density-00 env 4
       - 96  # MRR nfv-density-00 env 4
-    csit-vpp-perf-report-coverage-2005-2n-clx:
-      - 24  # ip4-00
-      - 25  # ip4-01
-      - 26  # ip4-02
-      - 27  # ip4-03
-      - 28  # ip4-04
-      - 29  # ip4-05
-      - 34  # ip6-00
-      - 36  # ip6-01
-      - 31  # l2-00
-      - 41  # l2-01
-      - 39  # lb-00
-      - 37  # memif-00
-      - 32  # vhost-00
-      - 33  # vhost-01
-      - 40  # vts-00
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-2n-clx:
-      - 3  # RC1 NDRPDR sel env4
+      - 3  # RC1 NDRPDR sel env5
     # TODO: Add:
     # csit-vpp-perf-report-coverage-2009-2n-clx:
 
@@ -2307,8 +2101,9 @@
       - 29  # NDRPDR sel 2001.0-4
       - 31  # NDRPDR sel 2001.0-4
       - 27  # MRR sel env 4
-    # TODO: Replace:
-    # csit-vpp-perf-report-iterative-2009-3n-tsh:
+    # TODO: Add:
+    csit-vpp-perf-report-iterative-2009-3n-tsh:
+      - 3  # RC1 NDRPDR sel env5
 
     csit-vpp-perf-verify-2001-3n-dnv:
       - 5   # NDRPDR sel
@@ -2419,7 +2214,7 @@
       - 34  # NDRPDR iter
     # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-3n-hsw:
-      - 3  # RC1 NDRPDR sel env 4
+      - 3  # RC1 NDRPDR sel env5
 
     csit-dpdk-perf-verify-2001-3n-skx:
       - 29  # NDRPDR sel xxv710
@@ -2455,7 +2250,7 @@
       - 37  # NDRPDR iter
     # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-3n-skx:
-      - 3  # RC1 NDRPDR sel env 4
+      - 3  # RC1 NDRPDR sel env5
 
     csit-dpdk-perf-verify-2001-2n-skx:
       - 35  # NDRPDR sel xxv710
@@ -2491,7 +2286,7 @@
       - 29  # NDRPDR iter
     # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-2n-skx:
-      - 3  # RC1 NDRPDR sel env 4
+      - 3  # RC1 NDRPDR sel env5
 
     csit-dpdk-perf-verify-2001-2n-clx:
       - 15  # NDRPDR sel
@@ -2527,7 +2322,7 @@
       - 29  # NDRPDR iter
     # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-2n-clx:
-      - 3  # RC1 NDRPDR sel env 4
+      - 3  # RC1 NDRPDR sel env5
 
     csit-dpdk-perf-verify-2001-2n-dnv:
       - 9   # NDRPDR sel
@@ -2594,7 +2389,7 @@
       - 5   # NDRPDR sel
     # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-3n-tsh:
-      - 1  # RC1 NDRPDR sel env 4
+      - 1  # RC1 NDRPDR sel env5
 
     csit-vpp-device-2005-ubuntu1804-1n-skx:
       - 35
@@ -2606,8 +2401,8 @@
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
@@ -2990,10 +2785,10 @@
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
@@ -3002,7 +2797,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
@@ -3016,10 +2811,10 @@
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
@@ -3028,7 +2823,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
 - type: "table"
@@ -3042,10 +2837,10 @@
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
@@ -3054,7 +2849,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
@@ -3068,10 +2863,10 @@
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
@@ -3080,7 +2875,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c pdr
 - type: "table"
@@ -3094,10 +2889,10 @@
       data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
@@ -3106,7 +2901,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c pdr
 - type: "table"
@@ -3120,10 +2915,10 @@
       data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
@@ -3132,7 +2927,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c ndr
 - type: "table"
@@ -3146,10 +2941,10 @@
       data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
@@ -3158,7 +2953,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c ndr
 - type: "table"
@@ -3172,10 +2967,10 @@
       data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
@@ -3184,7 +2979,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
@@ -3198,10 +2993,10 @@
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
@@ -3210,7 +3005,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
@@ -3224,10 +3019,10 @@
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
@@ -3236,7 +3031,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
@@ -3250,10 +3045,10 @@
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
@@ -3262,7 +3057,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
@@ -3276,10 +3071,10 @@
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
@@ -3288,7 +3083,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
@@ -3302,10 +3097,10 @@
       data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
@@ -3314,7 +3109,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
@@ -3328,10 +3123,10 @@
       data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
@@ -3340,7 +3135,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
@@ -3354,10 +3149,10 @@
       data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
@@ -3366,7 +3161,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
@@ -3380,10 +3175,10 @@
       data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
@@ -3392,7 +3187,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 ## VPP Performance Changes 2n-clx-x556 2t1c pdr
 #- type: "table"
@@ -3502,10 +3297,10 @@
       data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-dnv-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -3513,7 +3308,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
@@ -3527,10 +3322,10 @@
       data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-dnv-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -3538,7 +3333,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
@@ -3552,10 +3347,10 @@
       data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-dnv-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -3563,7 +3358,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
@@ -3577,10 +3372,10 @@
       data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-dnv-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -3588,7 +3383,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
@@ -3602,10 +3397,10 @@
       data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-dnv-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -3613,7 +3408,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
@@ -3627,10 +3422,10 @@
       data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-dnv-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -3638,7 +3433,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
@@ -3652,10 +3447,10 @@
       data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-dnv-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -3663,7 +3458,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
@@ -3677,10 +3472,10 @@
       data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-dnv-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -3688,7 +3483,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
@@ -3702,10 +3497,10 @@
       data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
@@ -3714,7 +3509,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
@@ -3728,10 +3523,10 @@
       data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
@@ -3740,7 +3535,7 @@
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
@@ -3754,10 +3549,10 @@
       data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
@@ -3766,7 +3561,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
@@ -3780,10 +3575,10 @@
       data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
@@ -3792,7 +3587,7 @@
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 - type: "table"
@@ -4158,10 +3953,10 @@
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
@@ -4170,7 +3965,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c mrr
 - type: "table"
@@ -4184,10 +3979,10 @@
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
@@ -4196,7 +3991,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 4t4c mrr
 - type: "table"
@@ -4210,10 +4005,10 @@
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
@@ -4222,7 +4017,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c mrr
 - type: "table"
@@ -4236,10 +4031,10 @@
       data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
@@ -4248,7 +4043,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
@@ -4262,10 +4057,10 @@
       data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
@@ -4274,7 +4069,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
@@ -4288,10 +4083,10 @@
       data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
@@ -4300,7 +4095,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
@@ -4314,10 +4109,10 @@
       data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
@@ -4326,7 +4121,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
@@ -4340,10 +4135,10 @@
       data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
@@ -4352,7 +4147,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
@@ -4366,10 +4161,10 @@
       data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
@@ -4378,7 +4173,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
@@ -4392,10 +4187,10 @@
       data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
@@ -4404,7 +4199,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
@@ -4418,10 +4213,10 @@
       data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
@@ -4430,7 +4225,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
@@ -4444,10 +4239,10 @@
       data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
@@ -4456,7 +4251,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 ## VPP Performance Changes 2n-clx-x556 2t1c mrr
 #- type: "table"
@@ -4533,10 +4328,10 @@
       data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4544,7 +4339,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
@@ -4558,10 +4353,10 @@
       data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4569,7 +4364,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
@@ -4583,10 +4378,10 @@
       data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4594,7 +4389,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
@@ -4608,10 +4403,10 @@
       data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4619,7 +4414,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
@@ -4633,10 +4428,10 @@
       data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4644,7 +4439,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
@@ -4658,10 +4453,10 @@
       data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-3"
+    - title: "2009.0-5 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
@@ -4669,7 +4464,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
@@ -4683,10 +4478,10 @@
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
@@ -4695,7 +4490,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
@@ -4709,10 +4504,10 @@
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
@@ -4721,7 +4516,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
@@ -4735,10 +4530,10 @@
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2005.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2009.0-4"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "2009.0-4 vs 2005.0-4"
+    - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
@@ -4747,7 +4542,7 @@
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
     - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
 - type: "table"
@@ -10778,8 +10573,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput"
@@ -10794,8 +10589,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput"
@@ -10811,7 +10606,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput"
@@ -10827,7 +10622,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput"
@@ -11105,7 +10900,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-1t1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-1t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe-ndr"
     layout: "plot-throughput"
@@ -11121,7 +10916,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-1t1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-1t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe-pdr"
     layout: "plot-throughput"
@@ -13494,8 +13289,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -13510,8 +13305,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -13527,7 +13322,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -13543,7 +13338,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -15443,7 +15238,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr-tsa"
     layout: "plot-throughput-speedup-analysis"
@@ -15459,7 +15254,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
@@ -16518,8 +16313,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput"
@@ -16534,42 +16329,42 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-ndr"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-features-nat44det-scale-avf-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-ndr"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-features-nat44det-scale-avf-ndr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H1-P63-S63-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1-p63-s63-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H16384-P63-S1032192-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H262144-P63-S16515072-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H65536-P63-S4128758-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p63-s63-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-ndr"
+    title: "2n-clx-xxv710-64b-2t1c-features-nat44det-scale-avf-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-pdr"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-features-nat44det-scale-avf-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-pdr"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-features-nat44det-scale-avf-pdr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H1-P63-S63-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1-p63-s63-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H16384-P63-S1032192-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H262144-P63-S16515072-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H65536-P63-S4128758-Ndrpdr.64B-2t1c-avf-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p63-s63-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-pdr"
+    title: "2n-clx-xxv710-64b-2t1c-features-nat44det-scale-avf-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
@@ -16583,7 +16378,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput"
@@ -16599,7 +16394,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput"
@@ -16670,8 +16465,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-ndr"
     layout: "plot-throughput"
@@ -16686,8 +16481,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
     layout: "plot-throughput"
@@ -17502,8 +17297,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -17518,42 +17313,42 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-features-snat44det-scale-avf-ndr-tsa"
+  title: "Speedup: 2n-clx-xxv710-64b-features-nat44det-scale-avf-ndr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-features-snat44det-scale-avf-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-features-nat44det-scale-avf-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H1-P63-S63-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1-p63-s63-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H16384-P63-S1032192-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H262144-P63-S16515072-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H65536-P63-S4128758-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p63-s63-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-features-snat44det-scale-avf-ndr"
+    title: "2n-clx-xxv710-64b-features-nat44det-scale-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-features-snat44det-scale-avf-pdr-tsa"
+  title: "Speedup: 2n-clx-xxv710-64b-features-nat44det-scale-avf-pdr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-features-snat44det-scale-avf-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-features-nat44det-scale-avf-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H1-P63-S63-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1-p63-s63-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H16384-P63-S1032192-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H262144-P63-S16515072-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Snat44Det-H65536-P63-S4128758-Ndrpdr.64B-.t.c-avf-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H1-P63-S63-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p63-s63-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H16384-P63-S1032192-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H262144-P63-S16515072-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-nat44Det-H65536-P63-S4128758-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-features-snat44det-scale-avf-pdr"
+    title: "2n-clx-xxv710-64b-features-nat44det-scale-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -17567,7 +17362,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -17583,7 +17378,7 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
@@ -17654,8 +17449,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-rdma-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-rdma-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-rdma-ethip4-features-ndr"
     layout: "plot-throughput-speedup-analysis"
@@ -17670,8 +17465,8 @@
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-rdma-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-snat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-rdma-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-rdma-ethip4-features-pdr"
     layout: "plot-throughput-speedup-analysis"