Report: Add vpp2005-env5 data
[csit.git] / resources / tools / presentation / specification.yaml
index 199d299..ffda71e 100644 (file)
     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:
         - 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:
         - 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:
         - 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:
         - 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
 
     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:
 
     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:
 
     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:
 
     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)
         - 35  # NDRPDR sel 2001.0-4
         - 36  # NDRPDR sel 2001.0-4
         - 38  # NDRPDR sel 2001.0-4
-    vpp-performance-changes-3n-hsw-ref:
+    vpp-performance-changes-3n-hsw-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 20  # NDRPDR sel env 4
         - 21  # NDRPDR sel env 4
         - 27  # NDRPDR sel env 4
         - 28  # NDRPDR sel env 4
         - 29  # NDRPDR sel env 4
+    vpp-performance-changes-3n-hsw-ref-env5:
+      csit-vpp-perf-report-iterative-2009-3n-hsw:
+        - 9   # rls2005 NDRPDR iter env 5
+        - 10  # rls2005 NDRPDR iter env 5
+        - 11  # rls2005 NDRPDR iter env 5
+        - 12  # rls2005 NDRPDR iter env 5
+        - 13  # rls2005 NDRPDR iter env 5
+        - 14  # rls2005 NDRPDR iter env 5
+        - 15  # rls2005 NDRPDR iter env 5
+        - 16  # rls2005 NDRPDR iter env 5
+        - 17  # rls2005 NDRPDR iter env 5
+        - 19  # rls2005 NDRPDR iter env 5
     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:
         - 52  # NDRPDR sel 2001.0-4
         - 53  # NDRPDR sel 2001.0-4
         - 54  # NDRPDR sel 2001.0-4
-    vpp-performance-changes-3n-skx-ref:
+    vpp-performance-changes-3n-skx-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
     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:
         - 103 # NDRPDR sel 2001.0-4
         - 104 # NDRPDR sel 2001.0-4
         - 105 # NDRPDR sel 2001.0-4
-    vpp-performance-changes-2n-skx-ref:
+    vpp-performance-changes-2n-skx-ref-env4:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
         - 125 # NDRPDR sel env 4
         - 126 # NDRPDR sel env 4
         - 127 # NDRPDR sel env 4
+    vpp-performance-changes-2n-skx-ref-env5:
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 13  # rls2005 NDRPDR iter env 5
+        - 16  # rls2005 NDRPDR iter env 5
+        - 17  # rls2005 NDRPDR iter env 5
+        - 18  # rls2005 NDRPDR iter env 5
+        - 19  # rls2005 NDRPDR iter env 5
+        - 21  # rls2005 NDRPDR iter env 5
     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:
         - 78  # NDRPDR sel 2001.0-4
         - 79  # NDRPDR sel 2001.0-4
         - 80  # NDRPDR sel 2001.0-4
-    vpp-performance-changes-2n-clx-ref:
+    vpp-performance-changes-2n-clx-ref-env4:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
         - 70  # NDRPDR sel env 4
         - 103 # NDRPDR sel env 4
         - 104 # NDRPDR sel env 4
+    vpp-performance-changes-2n-clx-ref-env5:
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 13  # rls2005 NDRPDR iter env 5
+        - 15  # rls2005 NDRPDR iter env 5
+        - 17  # rls2005 NDRPDR iter env 5
     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:
         - 28  # NDRPDR sel 2001.0-4
         - 29  # NDRPDR sel 2001.0-4
         - 31  # NDRPDR sel 2001.0-4
-    vpp-performance-changes-3n-tsh-ref:
+    vpp-performance-changes-3n-tsh-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 23  # NDRPDR sel env 4
         - 25  # NDRPDR sel env 4
         - 38  # NDRPDR sel env 4
         - 39  # NDRPDR sel env 4
         - 40  # NDRPDR sel env 4
+    vpp-performance-changes-3n-tsh-ref-env5:
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 8   # rls2005 NDRPDR iter env 5
     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:
     vpp-performance-changes-3n-hsw-mrr-h1:
       csit-vpp-perf-verify-2001-3n-hsw:
         - 17  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref:
+    vpp-performance-changes-3n-hsw-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
+    vpp-performance-changes-3n-hsw-mrr-ref-env5:
+      csit-vpp-perf-report-iterative-2009-3n-hsw:
+        - 18  # rls2005 MRR iter env 5
     vpp-performance-changes-3n-hsw-mrr-cmp:
       # TODO: Replace:
       # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-verify-2001-3n-skx:
         - 50  # MRR sel
         - 53  # MRR sel addition
-    vpp-performance-changes-3n-skx-mrr-ref:
+    vpp-performance-changes-3n-skx-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
     vpp-performance-changes-3n-skx-mrr-cmp:
       csit-vpp-perf-verify-2001-2n-skx:
         - 101 # MRR sel
         - 128 # MRR sel addition
-    vpp-performance-changes-2n-skx-mrr-ref:
+    vpp-performance-changes-2n-skx-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
+    vpp-performance-changes-2n-skx-mrr-ref-env5:
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 20  # rls2005 MRR iter env 5
     vpp-performance-changes-2n-skx-mrr-cmp:
       # TODO: Replace:
       # csit-vpp-perf-report-iterative-2009-2n-skx:
     vpp-performance-changes-2n-clx-mrr-h1:
       csit-vpp-perf-verify-2001-2n-clx:
         - 39  # MRR
-    vpp-performance-changes-2n-clx-mrr-ref:
+    vpp-performance-changes-2n-clx-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72   # MRR sel env 4
+    vpp-performance-changes-2n-clx-mrr-ref-env5:
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 16  # rls2005 MRR iter env 5
     vpp-performance-changes-2n-clx-mrr-cmp:
       # TODO: Replace:
       # csit-vpp-perf-report-iterative-2009-2n-clx:
     vpp-performance-changes-3n-tsh-mrr-h1:
       csit-vpp-perf-verify-2001-3n-tsh:
         - 9   # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-ref:
+    vpp-performance-changes-3n-tsh-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 27  # MRR sel env 4
     vpp-performance-changes-3n-tsh-mrr-cmp:
         - 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:
         - 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:
         - 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:
         - 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:
     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:
         - 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:
         - 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:
 
       - 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
+      - 18  # rls2005 MRR iter env 5
+      - 9   # rls2005 NDRPDR iter env 5
+      - 10  # rls2005 NDRPDR iter env 5
+      - 11  # rls2005 NDRPDR iter env 5
+      - 12  # rls2005 NDRPDR iter env 5
+      - 13  # rls2005 NDRPDR iter env 5
+      - 14  # rls2005 NDRPDR iter env 5
+      - 15  # rls2005 NDRPDR iter env 5
+      - 16  # rls2005 NDRPDR iter env 5
+      - 17  # rls2005 NDRPDR iter env 5
+      - 19  # rls2005 NDRPDR iter env 5
     # 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
       - 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
       - 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
+      - 20  # rls2005 MRR iter env 5
+      - 13  # rls2005 NDRPDR iter env 5
+      - 16  # rls2005 NDRPDR iter env 5
+      - 17  # rls2005 NDRPDR iter env 5
+      - 18  # rls2005 NDRPDR iter env 5
+      - 19  # rls2005 NDRPDR iter env 5
+      - 21  # rls2005 NDRPDR iter env 5
     # 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
       - 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
+      - 16  # rls2005 MRR iter env 5
+      - 13  # rls2005 NDRPDR iter env 5
+      - 15  # rls2005 NDRPDR iter env 5
+      - 17  # rls2005 NDRPDR iter env 5
     # 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
       - 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
+      - 8   # rls2005 NDRPDR iter env 5
 
     csit-vpp-perf-verify-2001-3n-dnv:
       - 5   # NDRPDR sel
       - 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
       - 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
       - 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
       - 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
       - 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                                ###
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c pdr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-ref"
+      data-set: "vpp-performance-changes-3n-skx-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-ref"
+      data-set: "vpp-performance-changes-3n-skx-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
+#      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-ref"
+      data-set: "vpp-performance-changes-3n-skx-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-ref"
+      data-set: "vpp-performance-changes-3n-skx-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
+#      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-ref"
+      data-set: "vpp-performance-changes-2n-skx-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-skx-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-ref"
+      data-set: "vpp-performance-changes-2n-skx-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-skx-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
+#      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-ref"
+      data-set: "vpp-performance-changes-2n-skx-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-skx-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-ref"
+      data-set: "vpp-performance-changes-2n-skx-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-skx-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
+#      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-ref"
+      data-set: "vpp-performance-changes-2n-clx-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-clx-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
+#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-ref"
+      data-set: "vpp-performance-changes-2n-clx-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-clx-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
+#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-ref"
+      data-set: "vpp-performance-changes-2n-clx-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-clx-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
+#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-ref"
+      data-set: "vpp-performance-changes-2n-clx-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-clx-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
+#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 ## VPP Performance Changes 2n-clx-x556 2t1c pdr
 #- type: "table"
 #  filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
 #  columns:
 #    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-2n-clx-ref"
+#      data-set: "vpp-performance-changes-2n-clx-ref-env4"
 #    - title: "2005.0-3"
 #      data-set: "vpp-performance-changes-2n-clx-cmp"
 #  comparisons:
 #  filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
 #  columns:
 #    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-2n-clx-ref"
+#      data-set: "vpp-performance-changes-2n-clx-ref-env4"
 #    - title: "2005.0-3"
 #      data-set: "vpp-performance-changes-2n-clx-cmp"
 #  comparisons:
 #  filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
 #  columns:
 #    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-2n-clx-ref"
+#      data-set: "vpp-performance-changes-2n-clx-ref-env4"
 #    - title: "2005.0-3"
 #      data-set: "vpp-performance-changes-2n-clx-cmp"
 #  comparisons:
 #  filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
 #  columns:
 #    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-2n-clx-ref"
+#      data-set: "vpp-performance-changes-2n-clx-ref-env4"
 #    - title: "2005.0-3"
 #      data-set: "vpp-performance-changes-2n-clx-cmp"
 #  comparisons:
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
+#      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
     - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
+#      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c mrr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 4t4c mrr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
+#      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c mrr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-4"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
     - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
+#      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-4"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
     - title: "2009.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
+#      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-4"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
+#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
+    - title: "2005.0-5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env5"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
+#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - '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-5 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 ## VPP Performance Changes 2n-clx-x556 2t1c mrr
 #- type: "table"
 #  filter: "'2T1C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
 #  columns:
 #    - title: "2001"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
+#      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
 #    - title: "2005"
 #      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
 #  comparisons:
 #  filter: "'4T2C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
 #  columns:
 #    - title: "2001"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
+#      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
 #    - title: "2005"
 #      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
 #  comparisons:
 #  filter: "'8T4C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
 #  columns:
 #    - title: "2001"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
+#      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
 #    - title: "2005"
 #      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
 #  comparisons:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
     - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env4"
     - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"
     - "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"