X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=05f4a8348f2c01c1517e57ecbae12dd0e2f43dc5;hb=dc373500b723dcdf45559e21f18a639e44da8035;hp=199d299d161ef0a1bb1d7b2d9fc46ec1ecec7a0a;hpb=0e3903c0ebdf1cb8e95b096012539cb7925ea6d0;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 199d299d16..05f4a8348f 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -153,12 +153,16 @@
     plot-vpp-throughput-lat-tsa-3n-hsw:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # RC2 NDRPDR iter env5
+        - 5   # RC2 NDRPDR iter env5
+        - 6   # RC2 NDRPDR iter env5
+        - 7   # RC2 NDRPDR iter env5
+        - 8   # RC2 NDRPDR iter env5
 
     plot-vpp-hdrh-lat-3n-hsw:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # RC2 NDRPDR iter env5
 
     plot-vpp-hoststack-3n-hsw:
       # TODO: Replace:
@@ -177,26 +181,36 @@
         - 13  # hoststack
 
     plot-dpdk-throughput-latency-3n-hsw:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
+        - 14  # NDRPDR iter env5
+        - 15  # NDRPDR iter env5
 
     plot-dpdk-hdrh-lat-3n-hsw:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 6   # NDRPDR iter env5
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 16  # RC2 NDRPDR iter env5
 
     plot-vpp-hdrh-lat-3n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 16  # RC2 NDRPDR iter env5
 
     plot-vpp-nfv-3n-skx-ndrpdr:
       # TODO: Replace:
@@ -215,26 +229,37 @@
         - 49  # MRR sel env 4
 
     plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR sel env5
+        - 5   # NDRPDR sel env5
+        - 6   # NDRPDR sel env5
+        - 7   # NDRPDR sel env5
+        - 8   # NDRPDR sel env5
+        - 9   # NDRPDR sel env5
+        - 14  # NDRPDR sel env5
+        - 11  # NDRPDR sel env5
+        - 12  # NDRPDR sel env5
+        - 13  # NDRPDR sel env5
 
     plot-dpdk-hdrh-lat-3n-skx:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # 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 env5
+        - 8   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 15  # RC2 NDRPDR iter env5
 
     plot-vpp-hdrh-lat-2n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 14  # RC2 NDRPDR iter env5
 
     plot-vpp-soak-2n-skx:
       # TODO: Replace:
@@ -280,26 +305,37 @@
         - 121 # Reconf env 4
 
     plot-dpdk-throughput-latency-2n-skx:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
 
     plot-dpdk-hdrh-lat-2n-skx:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
 
     # 2n-clx
 
     plot-vpp-throughput-lat-tsa-2n-clx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 7   # RC2 NDRPDR iter env5
+        - 9   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
 
     plot-vpp-hdrh-lat-2n-clx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 14  # RC2 NDRPDR iter env5
 
     plot-vpp-nfv-2n-clx-ndrpdr:
       # TODO: Replace:
@@ -345,47 +381,48 @@
         - 102 # Soak
 
     plot-dpdk-throughput-latency-2n-clx:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
 
     plot-dpdk-hdrh-lat-2n-clx:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
 
     # 3n-tsh
 
     plot-vpp-throughput-lat-tsa-3n-tsh:
       # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2009-3n-tsh:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 23  # NDRPDR sel env 4
-        - 25  # NDRPDR sel env 4
-        - 33  # NDRPDR sel env 4
-        - 34  # NDRPDR sel env 4
-        - 35  # NDRPDR sel env 4
-        - 36  # NDRPDR sel env 4
-        - 37  # NDRPDR sel env 4
-        - 38  # NDRPDR sel env 4
-        - 39  # NDRPDR sel env 4
-        - 40  # NDRPDR sel env 4
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 7   # RC2 NDRPDR iter env5
 
     plot-vpp-hdrh-lat-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-iterative-2009-3n-tsh:
+        - 7   # RC2 NDRPDR iter env5
 
     plot-dpdk-throughput-latency-3n-tsh:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1  # RC1 NDRPDR sel env5
+        - 1   # NDRPDR iter env5
+        - 3   # NDRPDR iter env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
 
     plot-dpdk-hdrh-lat-3n-tsh:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1  # RC1 NDRPDR sel env5
+        - 1   # NDRPDR iter env5
 
     # 3n-dnv
 
@@ -459,12 +496,19 @@
     vpp-nic-comparison-3n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 16  # RC2 NDRPDR iter env5
 
     vpp-nic-comparison-2n-skx:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 8   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 15  # RC2 NDRPDR iter env5
 
     vpp-nic-comparison-3n-skx-mrr:
       # TODO: Replace:
@@ -482,33 +526,29 @@
 
     vpp-perf-results-3n-hsw:
       # TODO: Replace:
-      # csit-vpp-perf-report-coverage-2009-3n-hsw:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+      csit-vpp-perf-report-coverage-2009-3n-hsw:
+        - 2   # RC2 env5 3n-hsw-ip4-00
 
     vpp-perf-results-3n-skx:
       # TODO: Replace:
-      # csit-vpp-perf-report-coverage-2009-3n-skx:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+      csit-vpp-perf-report-coverage-2009-3n-skx:
+        - 1   # RC2 env5 3n-skx-ip4-00
 
     vpp-perf-results-2n-skx:
       # TODO: Replace:
-      # csit-vpp-perf-report-coverage-2009-2n-skx:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+      csit-vpp-perf-report-coverage-2009-2n-skx:
+        - 7   # RC2 env5 2n-skx-ip4-00
 
     vpp-perf-results-2n-clx:
       # TODO: Replace:
-      # csit-vpp-perf-report-coverage-2009-2n-clx:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+      csit-vpp-perf-report-coverage-2009-2n-clx:
+        - 1   # RC2 env5 2n-clx-ip4-00
 
     vpp-perf-results-3n-tsh:
       # TODO: Replace:
       # csit-vpp-perf-report-coverage-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2009-3n-tsh:
-        - 3  # RC1 NDRPDR sel env5
+        - 7   # RC2 NDRPDR iter env5
 
     vpp-perf-results-3n-dnv:
       # TODO: Replace:
@@ -579,25 +619,24 @@
 
     vpp-device-results-ubuntu:
       # TODO: Replace:
-      # csit-vpp-device-2009-ubuntu1804-1n-skx:
-      csit-vpp-device-2005-ubuntu1804-1n-skx:
-        - 35
+      csit-vpp-device-2009-ubuntu1804-1n-skx:
+        - 89  # RC2 env 5
 
     dpdk-perf-results-3n-hsw:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 6   # NDRPDR iter env5
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR sel env5
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
 
     dpdk-perf-results-2n-clx:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
 
     dpdk-perf-results-2n-dnv:
       # TODO: Replace:
@@ -613,7 +652,7 @@
 
     dpdk-perf-results-3n-tsh:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1  # RC1 NDRPDR sel env5
+        - 1   # NDRPDR iter env5
 
 ###########################################################################
     # Tables (more than one data set)
@@ -644,7 +683,11 @@
     vpp-performance-changes-3n-hsw-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # RC2 NDRPDR iter env5
+        - 5   # RC2 NDRPDR iter env5
+        - 6   # RC2 NDRPDR iter env5
+        - 7   # RC2 NDRPDR iter env5
+        - 8   # RC2 NDRPDR iter env5
 
     vpp-performance-changes-3n-skx-h1:
       csit-vpp-perf-report-iterative-2005-3n-skx:
@@ -668,7 +711,10 @@
     vpp-performance-changes-3n-skx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 16  # RC2 NDRPDR iter env5
 
     vpp-performance-changes-2n-skx-h1:
       csit-vpp-perf-report-iterative-2005-2n-skx:
@@ -693,7 +739,11 @@
     vpp-performance-changes-2n-skx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 8   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 15  # RC2 NDRPDR iter env5
 
     vpp-performance-changes-2n-clx-h1:
       csit-vpp-perf-report-iterative-2005-2n-clx:
@@ -720,7 +770,11 @@
     vpp-performance-changes-2n-clx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 7   # RC2 NDRPDR iter env5
+        - 9   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
 
     vpp-performance-changes-2n-dnv-h1:
       csit-vpp-perf-verify-2001-2n-dnv:
@@ -819,18 +873,8 @@
         - 40  # NDRPDR sel env 4
     vpp-performance-changes-3n-tsh-cmp:
       # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2009-3n-tsh:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 23  # NDRPDR sel env 4
-        - 25  # NDRPDR sel env 4
-        - 33  # NDRPDR sel env 4
-        - 34  # NDRPDR sel env 4
-        - 35  # NDRPDR sel env 4
-        - 36  # NDRPDR sel env 4
-        - 37  # NDRPDR sel env 4
-        - 38  # NDRPDR sel env 4
-        - 39  # NDRPDR sel env 4
-        - 40  # NDRPDR sel env 4
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 7   # RC2 NDRPDR iter env5
 
     vpp-soak-vs-ndr-2n-skx-ref:
       # TODO: Replace:
@@ -1035,9 +1079,17 @@
         - 33  # NDRPDR iter
         - 34  # NDRPDR iter
     dpdk-performance-changes-3n-hsw-cmp:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
+        - 14  # NDRPDR iter env5
+        - 15  # NDRPDR iter env5
 
     dpdk-performance-changes-3n-skx-h1:
       csit-dpdk-perf-verify-2001-3n-skx:
@@ -1074,9 +1126,17 @@
         - 36  # NDRPDR iter
         - 37  # NDRPDR iter
     dpdk-performance-changes-3n-skx-cmp:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR sel env5
+        - 5   # NDRPDR sel env5
+        - 6   # NDRPDR sel env5
+        - 7   # NDRPDR sel env5
+        - 8   # NDRPDR sel env5
+        - 9   # NDRPDR sel env5
+        - 14  # NDRPDR sel env5
+        - 11  # NDRPDR sel env5
+        - 12  # NDRPDR sel env5
+        - 13  # NDRPDR sel env5
 
     dpdk-performance-changes-2n-skx-h1:
       csit-dpdk-perf-verify-2001-2n-skx:
@@ -1113,9 +1173,17 @@
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
     dpdk-performance-changes-2n-skx-cmp:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
 
     dpdk-performance-changes-2n-clx-h1:
       csit-dpdk-perf-verify-2001-2n-clx:
@@ -1152,9 +1220,17 @@
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
     dpdk-performance-changes-2n-clx-cmp:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
 
     dpdk-performance-changes-2n-dnv-h1:
       csit-dpdk-perf-verify-2001-2n-dnv:
@@ -1252,36 +1328,65 @@
     dpdk-performance-changes-3n-tsh-cmp:
       # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1  # RC1 NDRPDR sel env5
+        - 1   # NDRPDR iter env5
+        - 3   # NDRPDR iter env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
 
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # RC2 NDRPDR iter env5
+        - 5   # RC2 NDRPDR iter env5
+        - 6   # RC2 NDRPDR iter env5
+        - 7   # RC2 NDRPDR iter env5
+        - 8   # RC2 NDRPDR iter env5
     vpp-compare-testbeds-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 16  # RC2 NDRPDR iter env5
 
     vpp-compare-testbeds-skx-clx-ref:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 8   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 15  # RC2 NDRPDR iter env5
     vpp-compare-testbeds-skx-clx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 7   # RC2 NDRPDR iter env5
+        - 9   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
 
     vpp-compare-testbeds-hsw-clx-ref:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # RC2 NDRPDR iter env5
+        - 5   # RC2 NDRPDR iter env5
+        - 6   # RC2 NDRPDR iter env5
+        - 7   # RC2 NDRPDR iter env5
+        - 8   # RC2 NDRPDR iter env5
     vpp-compare-testbeds-hsw-clx-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 7   # RC2 NDRPDR iter env5
+        - 9   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
 
     vpp-compare-testbeds-mrr-ref:
       # TODO: Replace:
@@ -1317,33 +1422,72 @@
         - 72  # MRR env 4
 
     dpdk-compare-testbeds-ref:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 3  # RC1 NDRPDR sel env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
+        - 14  # NDRPDR iter env5
+        - 15  # NDRPDR iter env5
     dpdk-compare-testbeds-cmp:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR sel env5
+        - 5   # NDRPDR sel env5
+        - 6   # NDRPDR sel env5
+        - 7   # NDRPDR sel env5
+        - 8   # NDRPDR sel env5
+        - 9   # NDRPDR sel env5
+        - 14  # NDRPDR sel env5
+        - 11  # NDRPDR sel env5
+        - 12  # NDRPDR sel env5
+        - 13  # NDRPDR sel env5
 
     dpdk-compare-testbeds-skx-clx-ref:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
     dpdk-compare-testbeds-skx-clx-cmp:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
 
     # Compare topologies
 
     vpp-compare-topologies-ref:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 16  # RC2 NDRPDR iter env5
     vpp-compare-topologies-cmp:
       # TODO: Add:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 8   # RC2 NDRPDR iter env5
+        - 10  # RC2 NDRPDR iter env5
+        - 12  # RC2 NDRPDR iter env5
+        - 14  # RC2 NDRPDR iter env5
+        - 15  # RC2 NDRPDR iter env5
 
     vpp-compare-topologies-mrr-ref:
       # TODO: Replace:
@@ -1357,13 +1501,29 @@
         - 99  # MRR sel env 4
 
     dpdk-compare-topologies-ref:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR sel env5
+        - 5   # NDRPDR sel env5
+        - 6   # NDRPDR sel env5
+        - 7   # NDRPDR sel env5
+        - 8   # NDRPDR sel env5
+        - 9   # NDRPDR sel env5
+        - 14  # NDRPDR sel env5
+        - 11  # NDRPDR sel env5
+        - 12  # NDRPDR sel env5
+        - 13  # NDRPDR sel env5
     dpdk-compare-topologies-cmp:
-      # TODO: Add:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 3  # RC1 NDRPDR sel env5
+        - 4   # NDRPDR iter env5
+        - 5   # NDRPDR iter env5
+        - 6   # NDRPDR iter env5
+        - 7   # NDRPDR iter env5
+        - 8   # NDRPDR iter env5
+        - 9   # NDRPDR iter env5
+        - 10  # NDRPDR iter env5
+        - 11  # NDRPDR iter env5
+        - 12  # NDRPDR iter env5
+        - 13  # NDRPDR iter env5
 
   plot-layouts:
 
@@ -1938,9 +2098,14 @@
       - 13  # hoststack
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-3n-hsw:
-      - 3  # RC1 NDRPDR sel env5
+      - 4   # RC2 NDRPDR iter env5
+      - 5   # RC2 NDRPDR iter env5
+      - 6   # RC2 NDRPDR iter env5
+      - 7   # RC2 NDRPDR iter env5
+      - 8   # RC2 NDRPDR iter env5
     # TODO: Add:
-    # csit-vpp-perf-report-coverage-2009-3n-hsw:
+    csit-vpp-perf-report-coverage-2009-3n-hsw:
+      - 2   # RC2 env5 3n-hsw-ip4-00
 
     # TODO: Add for hoststack:
     # csit-vpp-perf-report-iterative-2009-3n-hsw: OR
@@ -1973,9 +2138,13 @@
       - 49  # MRR sel env 4
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-3n-skx:
-      - 3  # RC1 NDRPDR sel env5
+      - 10  # RC2 NDRPDR iter env5
+      - 12  # RC2 NDRPDR iter env5
+      - 14  # RC2 NDRPDR iter env5
+      - 16  # RC2 NDRPDR iter env5
     # TODO: Add:
-    # csit-vpp-perf-report-coverage-2009-3n-skx:
+    csit-vpp-perf-report-coverage-2009-3n-skx:
+      - 1   # RC2 env5 3n-skx-ip4-00
 
     csit-vpp-perf-verify-2001-2n-skx:
       - 101  # MRR sel - old
@@ -2023,9 +2192,14 @@
       - 115 # MRR nf-density-sel env 4
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-2n-skx:
-      - 3  # RC1 NDRPDR sel env5
+      - 8   # RC2 NDRPDR iter env5
+      - 10  # RC2 NDRPDR iter env5
+      - 12  # RC2 NDRPDR iter env5
+      - 14  # RC2 NDRPDR iter env5
+      - 15  # RC2 NDRPDR iter env5
     # TODO: Add:
-    # csit-vpp-perf-report-coverage-2009-2n-skx:
+    csit-vpp-perf-report-coverage-2009-2n-skx:
+      - 7   # RC2 env5 2n-skx-ip4-00
 
     csit-vpp-perf-verify-2001-2n-clx:
       - 39  # MRR
@@ -2074,9 +2248,14 @@
       - 96  # MRR nfv-density-00 env 4
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-2n-clx:
-      - 3  # RC1 NDRPDR sel env5
+      - 7   # RC2 NDRPDR iter env5
+      - 9   # RC2 NDRPDR iter env5
+      - 10  # RC2 NDRPDR iter env5
+      - 12  # RC2 NDRPDR iter env5
+      - 14  # RC2 NDRPDR iter env5
     # TODO: Add:
-    # csit-vpp-perf-report-coverage-2009-2n-clx:
+    csit-vpp-perf-report-coverage-2009-2n-clx:
+      - 1   # RC2 env5 2n-clx-ip4-00
 
     csit-vpp-perf-verify-2001-3n-tsh:
       - 9   # MRR sel
@@ -2103,7 +2282,7 @@
       - 27  # MRR sel env 4
     # TODO: Add:
     csit-vpp-perf-report-iterative-2009-3n-tsh:
-      - 3  # RC1 NDRPDR sel env5
+      - 7   # RC2 NDRPDR iter env5
 
     csit-vpp-perf-verify-2001-3n-dnv:
       - 5   # NDRPDR sel
@@ -2212,9 +2391,17 @@
       - 32  # NDRPDR iter
       - 33  # NDRPDR iter
       - 34  # NDRPDR iter
-    # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-3n-hsw:
-      - 3  # RC1 NDRPDR sel env5
+      - 6   # NDRPDR iter env5
+      - 7   # NDRPDR iter env5
+      - 8   # NDRPDR iter env5
+      - 9   # NDRPDR iter env5
+      - 10  # NDRPDR iter env5
+      - 11  # NDRPDR iter env5
+      - 12  # NDRPDR iter env5
+      - 13  # NDRPDR iter env5
+      - 14  # NDRPDR iter env5
+      - 15  # NDRPDR iter env5
 
     csit-dpdk-perf-verify-2001-3n-skx:
       - 29  # NDRPDR sel xxv710
@@ -2248,9 +2435,17 @@
       - 35  # NDRPDR iter
       - 36  # NDRPDR iter
       - 37  # NDRPDR iter
-    # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-3n-skx:
-      - 3  # RC1 NDRPDR sel env5
+      - 4   # NDRPDR sel env5
+      - 5   # NDRPDR sel env5
+      - 6   # NDRPDR sel env5
+      - 7   # NDRPDR sel env5
+      - 8   # NDRPDR sel env5
+      - 9   # NDRPDR sel env5
+      - 14  # NDRPDR sel env5
+      - 11  # NDRPDR sel env5
+      - 12  # NDRPDR sel env5
+      - 13  # NDRPDR sel env5
 
     csit-dpdk-perf-verify-2001-2n-skx:
       - 35  # NDRPDR sel xxv710
@@ -2284,9 +2479,17 @@
       - 27  # NDRPDR iter
       - 28  # NDRPDR iter
       - 29  # NDRPDR iter
-    # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-2n-skx:
-      - 3  # RC1 NDRPDR sel env5
+      - 4   # NDRPDR iter env5
+      - 5   # NDRPDR iter env5
+      - 6   # NDRPDR iter env5
+      - 7   # NDRPDR iter env5
+      - 8   # NDRPDR iter env5
+      - 9   # NDRPDR iter env5
+      - 10  # NDRPDR iter env5
+      - 11  # NDRPDR iter env5
+      - 12  # NDRPDR iter env5
+      - 13  # NDRPDR iter env5
 
     csit-dpdk-perf-verify-2001-2n-clx:
       - 15  # NDRPDR sel
@@ -2320,9 +2523,17 @@
       - 27  # NDRPDR iter
       - 28  # NDRPDR iter
       - 29  # NDRPDR iter
-    # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-2n-clx:
-      - 3  # RC1 NDRPDR sel env5
+      - 4   # NDRPDR iter env5
+      - 5   # NDRPDR iter env5
+      - 6   # NDRPDR iter env5
+      - 7   # NDRPDR iter env5
+      - 8   # NDRPDR iter env5
+      - 9   # NDRPDR iter env5
+      - 10  # NDRPDR iter env5
+      - 11  # NDRPDR iter env5
+      - 12  # NDRPDR iter env5
+      - 13  # NDRPDR iter env5
 
     csit-dpdk-perf-verify-2001-2n-dnv:
       - 9   # NDRPDR sel
@@ -2389,20 +2600,25 @@
       - 5   # NDRPDR sel
     # TODO: Add:
     csit-dpdk-perf-report-iterative-2009-3n-tsh:
-      - 1  # RC1 NDRPDR sel env5
+      - 1   # NDRPDR iter env5
+      - 3   # NDRPDR iter env5
+      - 4   # NDRPDR iter env5
+      - 5   # NDRPDR iter env5
+      - 6   # NDRPDR iter env5
+      - 7   # NDRPDR iter env5
+      - 9   # NDRPDR iter env5
 
-    csit-vpp-device-2005-ubuntu1804-1n-skx:
-      - 35
     # TODO: Add:
-    # csit-vpp-device-2009-ubuntu1804-1n-skx:
+    csit-vpp-device-2009-ubuntu1804-1n-skx:
+      - 89  # RC2 env 5
 
 - type: "output"
   output: "report"
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
@@ -10573,8 +10789,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"
@@ -10589,8 +10805,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"
@@ -10606,7 +10822,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"
@@ -10622,7 +10838,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"
@@ -10900,7 +11116,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"
@@ -10916,7 +11132,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"
@@ -13289,8 +13505,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"
@@ -13305,8 +13521,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"
@@ -13322,7 +13538,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"
@@ -13338,7 +13554,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"
@@ -15238,7 +15454,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"
@@ -15254,7 +15470,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"
@@ -16313,8 +16529,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"
@@ -16329,42 +16545,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"
@@ -16378,7 +16594,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"
@@ -16394,7 +16610,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"
@@ -16465,8 +16681,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"
@@ -16481,8 +16697,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"
@@ -17297,8 +17513,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"
@@ -17313,42 +17529,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"
@@ -17362,7 +17578,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"
@@ -17378,7 +17594,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"
@@ -17449,8 +17665,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"
@@ -17465,8 +17681,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"