Report: Add snat44det tests to graphs
[csit.git] / resources / tools / presentation / specification.yaml
index 6d51ea3..038c4b5 100644 (file)
     # 3n-hsw
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 20  # NDRPDR sel env 4
         - 21  # NDRPDR sel env 4
         - 29  # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 29  # NDRPDR sel env 4
 
-#    plot-vpp-nfv-3n-hsw-ndrpdr:
-#      csit-vpp-perf-report-iterative-2005-3n-hsw:
-#        - 3   # NDRPDR sel
-#        - 4   # NDRPDR sel
-#        - 5   # NDRPDR sel
-#        - 10  # NDRPDR sel
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 15  # NDRPDR sel
-#        - 16  # NDRPDR sel
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-
-#    plot-vpp-nfv-3n-hsw-mrr:
-#      csit-vpp-perf-report-iterative-2005-3n-hsw:
-#        - 13  # MRR
-
     plot-vpp-hoststack-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw: OR
+      # csit-vpp-perf-verify-2009-3n-hsw:
       csit-vpp-perf-verify-2005-3n-hsw:
         - 3   # hoststack
         - 5   # hoststack
         - 13  # hoststack
 
     plot-dpdk-throughput-latency-3n-hsw:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
         - 26  # NDRPDR iter
         - 34  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-3n-hsw:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
         - 44  # NDRPDR sel env 4
         - 45  # NDRPDR sel env 4
         - 47  # NDRPDR sel env 4
+        - 55  # NDRPDR sel env 4
+        - 56  # NDRPDR sel env 4
+        - 57  # NDRPDR sel env 4
+        - 61  # NDRPDR sel env 4
+        - 62  # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 47  # NDRPDR sel env 4
 
     plot-vpp-nfv-3n-skx-ndrpdr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel ??? all x710 failed
         - 34  # NDRPDR sel
 
     plot-vpp-nfv-3n-skx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
     plot-dpdk-throughput-latency-3n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
         - 37  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-3n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
         - 92  # NDRPDR sel env 4
         - 93  # NDRPDR sel env 4
         - 94  # NDRPDR sel env 4
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 94  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 122 # Soak
         - 123 # Soak
 
     plot-vpp-nfv-2n-skx-ndrpdr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 113 # nf-density-sel env 4
         - 114 # nf-density-sel env 4
+        - 124 # nf-density-sel env 4
+        - 128 # nf-density-sel env 4
+        - 129 # nf-density-sel env 4
+        - 131 # nf-density-sel env 4
+        - 132 # nf-density-sel env 4
+        - 135 # nf-density-sel env 4
+        - 136 # nf-density-sel env 4
+        - 139 # nf-density-sel env 4
 
     plot-vpp-nfv-2n-skx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 115 # nf-density-sel env 4
 
     plot-vpp-nfv-reconf-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 106 # Reconf env 4
         - 107 # Reconf env 4
         - 121 # Reconf env 4
 
     plot-dpdk-throughput-latency-2n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
         - 29  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-2n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
 
     # 2n-clx
 
     plot-vpp-throughput-lat-tsa-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
         - 68  # NDRPDR sel env 4
         - 69  # NDRPDR sel env 4
         - 70  # NDRPDR sel env 4
+        - 103 # NDRPDR sel env 4
+        - 104 # NDRPDR sel env 4
 
     plot-vpp-hdrh-lat-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 70  # NDRPDR sel env 4
 
     plot-vpp-nfv-2n-clx-ndrpdr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 91  # nfv-density-00 env 4
         - 92  # nfv-density-00 env 4
         - 98  # nfv-density-00 env 4
         - 99  # nfv-density-00 env 4
         - 100 # nfv-density-00 env 4
+        - 105 # nfv-density-00 env 4
+        - 106 # nfv-density-00 env 4
+        - 108 # nfv-density-00 env 4
 
     plot-vpp-nfv-2n-clx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 96  # MRR
 
     plot-vpp-nfv-reconf-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 81  # Reconf env 4
         - 82  # Reconf env 4
         - 90  # Reconf env 4
 
     plot-vpp-soak-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 101 # Soak
+        - 102 # Soak
 
     plot-dpdk-throughput-latency-2n-clx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
         - 29  # NDRPDR iter
 
     plot-dpdk-hdrh-lat-2n-clx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 21  # NDRPDR iter
 
     # 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
 
     plot-vpp-hdrh-lat-3n-tsh:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 25  # NDRPDR sel env 4
+        - 35  # NDRPDR sel env 4
 
     plot-dpdk-throughput-latency-3n-tsh:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-tsh:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
 
     plot-dpdk-hdrh-lat-3n-tsh:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-tsh:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
 
     # 3n-dnv
 
     plot-vpp-throughput-lat-tsa-3n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-dnv:
       csit-vpp-perf-report-iterative-2005-3n-dnv:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 12  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-dnv:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-dnv:
       csit-dpdk-perf-report-iterative-2005-3n-dnv:
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
     # 2n-dnv
 
     plot-vpp-throughput-lat-tsa-2n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-dnv:
       csit-vpp-perf-report-iterative-2005-2n-dnv:
         - 3   # NDRPDR sel
         - 6   # NDRPDR sel
         - 14  # NDRPDR sel
 
     plot-dpdk-throughput-latency-2n-dnv:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-dnv:
       csit-dpdk-perf-report-iterative-2005-2n-dnv:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
     # NIC Comparisons
 
     vpp-nic-comparison-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
         - 44  # NDRPDR sel env 4
         - 45  # NDRPDR sel env 4
         - 47  # NDRPDR sel env 4
+        - 55  # NDRPDR sel env 4
+        - 56  # NDRPDR sel env 4
+        - 57  # NDRPDR sel env 4
+        - 61  # NDRPDR sel env 4
+        - 62  # NDRPDR sel env 4
 
     vpp-nic-comparison-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
         - 92  # NDRPDR sel env 4
         - 93  # NDRPDR sel env 4
         - 94  # NDRPDR sel env 4
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
 
     vpp-nic-comparison-3n-skx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
     vpp-nic-comparison-2n-skx-mrr:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
 
     # Results
 
     vpp-perf-results-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-3n-hsw:
       csit-vpp-perf-report-coverage-2005-3n-hsw:
         - 74  # crypto-00
         - 75  # crypto-01
         - 109 # vhost-02
 
     vpp-perf-results-3n-skx:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 47  # NDRPDR sel env 4
-#      csit-vpp-perf-report-coverage-2005-3n-skx:
-#        - 10  # perf-full-3n-skx-crypto_I
-#        - 11  # perf-full-3n-skx-crypto_II
-#        - 12  # perf-full-3n-skx-crypto_III
-#        - 5   # perf-full-3n-skx-ip4_I
-#        - 14  # perf-full-3n-skx-ip4_II
-#        - 7   # perf-full-3n-skx-ip4_III
-#        - 15  # perf-full-3n-skx-ip4_IV
-#        - 16  # perf-full-3n-skx-ip4_V
-#        - 17  # perf-full-3n-skx-ip4_VI
-#        - 18  # perf-full-3n-skx-ip4_VII
-#        - 19  # perf-full-3n-skx-ip4_VIII
-#        - 20  # perf-full-3n-skx-ip4_IX
-#        - 24  # perf-full-3n-skx-ip6_I
-#        - 25  # perf-full-3n-skx-ip6_II
-#        - 21  # perf-full-3n-skx-ip4tunnels-I
-#        - 22  # perf-full-3n-skx-ip4tunnels-II
-#        - 23  # perf-full-3n-skx-ip4tunnels-III
-#        - 26  # perf-full-3n-skx-ip6tunnels-I
-#        - 28  # perf-full-3n-skx-l2_II
-#        - 29  # perf-full-3n-skx-l2_III
-#        - 30  # perf-full-3n-skx-l2_IV
-#        - 32  # perf-full-3n-skx-l2_VI
-#        - 33  # perf-full-3n-skx-l2_VII
-#        - 34  # perf-full-3n-skx-l2_VIII
-#        - 35  # perf-full-3n-skx-l2_IX
-#        - 36  # perf-full-3n-skx-l2_X
-#        - 37  # perf-full-3n-skx-l2_XI
-#        - 38  # perf-full-3n-skx-memif
-#        - 39  # perf-full-3n-skx-srv6-I
-#        - 40  # perf-full-3n-skx-srv6-II
-#        - 43  # perf-full-3n-skx-vhost-III
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-3n-skx:
+      csit-vpp-perf-report-coverage-2005-3n-skx:
+        - 45  # crypto-00
+        - 46  # crypto-01
+        - 47  # crypto-02
+        - 83  # crypto-03
+        - 50  # ip4-00
+        - 51  # ip4-01
+        - 52  # ip4-02
+        - 53  # ip4-03
+        - 54  # ip4-04
+        - 55  # ip4-05
+        - 56  # ip4-06
+        - 57  # ip4-07
+        - 58  # ip4-08
+        - 59  # ip4tun-00
+        - 60  # ip4tun-01
+        - 61  # ip4tun-02
+        - 62  # ip6-00
+        - 63  # ip6-01
+        - 64  # ip6tun-00
+        - 65  # l2-00
+        - 66  # l2-01
+        - 67  # l2-02
+        - 68  # l2-03
+        - 69  # l2-04
+        - 84  # l2-05
+        - 71  # l2-06
+        - 72  # l2-07
+        - 73  # l2-08
+        - 85  # l2-09
+        - 75  # l2-10
+        - 76  # memif-00
+        - 77  # srv6-00
+        - 78  # srv6-01
+        - 88  # vhost-00
+        - 89  # vhost-01
+        - 81  # vhost-02
+        - 83  # vhost-03
 
     vpp-perf-results-2n-skx:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 94  # NDRPDR sel env 4
-#      csit-vpp-perf-report-coverage-2005-2n-skx:
-#        - 11  # perf-full-2n-skx-ip4_I
-#        - 3   # perf-full-2n-skx-ip4_II
-#        - 18  # perf-full-2n-skx-ip4_III
-#        - 19  # perf-full-2n-skx-ip4_IV
-#        - 5   # perf-full-2n-skx-ip4_V
-#        - 20  # perf-full-2n-skx-ip4_VI
-#        - 7   # perf-full-2n-skx-ip6_I
-#        - 21  # perf-full-2n-skx-ip6_II
-#        - 9   # perf-full-2n-skx-l2_I
-#        - 22  # perf-full-2n-skx-l2_II
-#        - 23  # perf-full-2n-skx-memif
-#        - 24  # perf-full-2n-skx-loadbalancer
-#        - 25  # perf-full-2n-skx-vhost I
-#        - 26  # perf-full-2n-skx-vhost II
-#        - 27  # perf-full-2n-skx-vts
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-2n-skx:
+      csit-vpp-perf-report-coverage-2005-2n-skx:
+        - 28  # ip4-00
+        - 29  # ip4-01
+        - 30  # ip4-02
+        - 31  # ip4-03
+        - 32  # ip4-04
+        - 33  # ip4-05
+        - 34  # ip6-00
+        - 35  # ip6-01
+        - 36  # l2-00
+        - 37  # l2-01
+        - 38  # lb-00
+        - 39  # memif-00
+        - 40  # vhost-00
+        - 41  # vhost-01
+        - 42  # vts-00
 
     vpp-perf-results-2n-clx:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 62  # NDRPDR sel env 4
-#      csit-vpp-perf-report-coverage-2005-2n-clx:
-#        - 21  # perf-full-2n-clx-ip4_I
-#        - 2   # perf-full-2n-clx-ip4_II
-#        - 3   # perf-full-2n-clx-ip4_III
-#        - 4   # perf-full-2n-clx-ip4_IV
-#        - 5   # perf-full-2n-clx-ip4_V
-#        - 6   # perf-full-2n-clx-ip4_VI
-#        - 7   # perf-full-2n-clx-ip6_I
-#        - 16  # perf-full-2n-clx-ip6_II
-#        - 23  # perf-full-2n-clx-l2_I
-#        - 10  # perf-full-2n-clx-l2_II
-#        - 11  # perf-full-2n-clx-memif
-#        - 12  # perf-full-2n-clx-loadbalancer
-#        - 13  # perf-full-2n-clx-vhost I
-#        - 22  # perf-full-2n-clx-vhost II
-#        - 15  # perf-full-2n-clx-vts
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-2n-clx:
+      csit-vpp-perf-report-coverage-2005-2n-clx:
+        - 24  # ip4-00
+        - 25  # ip4-01
+        - 26  # ip4-02
+        - 27  # ip4-03
+        - 28  # ip4-04
+        - 29  # ip4-05
+        - 34  # ip6-00
+        - 36  # ip6-01
+        - 31  # l2-00
+        - 41  # l2-01
+        - 39  # lb-00
+        - 37  # memif-00
+        - 32  # vhost-00
+        - 33  # vhost-01
+        - 40  # vts-00
 
     vpp-perf-results-3n-tsh:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 25  # NDRPDR sel env 4
+        - 35  # NDRPDR sel env 4
 
     vpp-perf-results-3n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-3n-dnv:
       csit-vpp-perf-report-coverage-2005-3n-dnv:
         - 1   # perf-full-3n-dnv-crypto_I
         - 24  # perf-full-3n-dnv-crypto_II
         - 23  # perf-full-3n-dnv-ip4-tunnels_I
 
     vpp-perf-results-2n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-coverage-2009-2n-dnv:
       csit-vpp-perf-report-coverage-2005-2n-dnv:
         - 1   # perf-full-2n-dnv-ip4_I
         - 2   # perf-full-2n-dnv-ip4_II
         - 6   # perf-full-2n-dnv-l2_II
 
     vpp-mrr-results-3n-hsw:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
 
     vpp-mrr-results-3n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
     vpp-mrr-results-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
 
     vpp-mrr-results-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72  # MRR env 4
 
     vpp-mrr-results-3n-tsh:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 27  # MRR sel env 4
 
     vpp-mrr-results-3n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-dnv:
       csit-vpp-perf-report-iterative-2005-3n-dnv:
         - 8   # MRR
 
     vpp-mrr-results-2n-dnv:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-dnv:
       csit-vpp-perf-report-iterative-2005-2n-dnv:
         - 15  # MRR sel
 
     vpp-device-results-ubuntu:
+      # TODO: Replace:
+      # csit-vpp-device-2009-ubuntu1804-1n-skx:
       csit-vpp-device-2005-ubuntu1804-1n-skx:
         - 35
 
     dpdk-perf-results-3n-hsw:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
 
     dpdk-perf-results-3n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
 
     dpdk-perf-results-2n-skx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
 
     dpdk-perf-results-2n-clx:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 21  # NDRPDR iter
 
     dpdk-perf-results-2n-dnv:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-dnv:
       csit-dpdk-perf-report-iterative-2005-2n-dnv:
         - 8   # NDRPDR sel
 
     dpdk-perf-results-3n-dnv:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-dnv:
       csit-dpdk-perf-report-iterative-2005-3n-dnv:
         - 6   # NDRPDR sel
 
     dpdk-perf-results-3n-tsh:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-tsh:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
 
     # Performance changes
 
     vpp-performance-changes-3n-hsw-h1:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-ref:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 34  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-cmp:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-cmp-2:
+        - 31  # NDRPDR sel 2001.0-4
+        - 32  # NDRPDR sel 2001.0-4
+        - 33  # NDRPDR sel 2001.0-4
+        - 34  # NDRPDR sel 2001.0-4
+        - 35  # NDRPDR sel 2001.0-4
+        - 36  # NDRPDR sel 2001.0-4
+        - 38  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-3n-hsw-ref:
       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-cmp-2001.0-4:
+    vpp-performance-changes-3n-hsw-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 31  # NDRPDR sel 2001.0-4
-        - 32  # NDRPDR sel 2001.0-4
-        - 33  # NDRPDR sel 2001.0-4
-        - 34  # NDRPDR sel 2001.0-4
-        - 35  # NDRPDR sel 2001.0-4
-        - 36  # NDRPDR sel 2001.0-4
-        - 38  # NDRPDR sel 2001.0-4
+        - 20  # NDRPDR sel env 4
+        - 21  # NDRPDR sel env 4
+        - 22  # NDRPDR sel env 4
+        - 23  # NDRPDR sel env 4
+        - 24  # NDRPDR sel env 4
+        - 25  # NDRPDR sel env 4
+        - 26  # NDRPDR sel env 4
+        - 27  # NDRPDR sel env 4
+        - 28  # NDRPDR sel env 4
+        - 29  # NDRPDR sel env 4
 
     vpp-performance-changes-3n-skx-h1:
-      csit-vpp-perf-verify-1908_1-3n-skx:
-        - 26  # NDRPDR sel - new1908.1
-        - 27  # NDRPDR sel - new1908.1
-        - 28  # NDRPDR sel - new1908.1
-        - 29  # NDRPDR sel - new1908.1
-        - 30  # NDRPDR sel - new1908.1
-        - 31  # NDRPDR sel - new1908.1
-        - 33  # NDRPDR sel - new1908.1
-        - 34  # NDRPDR sel - new1908.1
-        - 35  # NDRPDR sel - new1908.1
-        - 36  # NDRPDR sel - new1908.1
-    vpp-performance-changes-3n-skx-ref:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0
-        - 71  # NDRPDR sel - new2001.0
-        - 72  # NDRPDR sel - new2001.0
-        - 76  # NDRPDR sel - new2001.0
-        - 77  # NDRPDR sel - new2001.0
-        - 78  # NDRPDR sel - new2001.0
-        - 80  # NDRPDR sel - new2001.0
-    vpp-performance-changes-3n-skx-cmp:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
-    vpp-performance-changes-3n-skx-cmp-2:
+        - 50  # NDRPDR sel 2001.0-4
+        - 51  # NDRPDR sel 2001.0-4
+        - 52  # NDRPDR sel 2001.0-4
+        - 53  # NDRPDR sel 2001.0-4
+        - 54  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-3n-skx-ref:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
         - 44  # NDRPDR sel env 4
         - 45  # NDRPDR sel env 4
         - 47  # NDRPDR sel env 4
-    vpp-performance-changes-3n-skx-cmp-2001.0-4:
+        - 55  # NDRPDR sel env 4
+        - 56  # NDRPDR sel env 4
+        - 57  # NDRPDR sel env 4
+        - 61  # NDRPDR sel env 4
+        - 62  # NDRPDR sel env 4
+    vpp-performance-changes-3n-skx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 50  # NDRPDR sel 2001.0-4
-        - 51  # NDRPDR sel 2001.0-4
-        - 52  # NDRPDR sel 2001.0-4
-        - 53  # NDRPDR sel 2001.0-4
-        - 54  # NDRPDR sel 2001.0-4
+        - 42  # NDRPDR sel env 4
+        - 43  # NDRPDR sel env 4
+        - 44  # NDRPDR sel env 4
+        - 45  # NDRPDR sel env 4
+        - 47  # NDRPDR sel env 4
+        - 55  # NDRPDR sel env 4
+        - 56  # NDRPDR sel env 4
+        - 57  # NDRPDR sel env 4
+        - 61  # NDRPDR sel env 4
+        - 62  # NDRPDR sel env 4
 
     vpp-performance-changes-2n-skx-h1:
-      csit-vpp-perf-verify-1908_1-2n-skx:
-        - 39  # NDRPDR sel - new1908.1
-        - 40  # NDRPDR sel - new1908.1
-        - 41  # NDRPDR sel - new1908.1
-        - 43  # NDRPDR sel - new1908.1
-        - 44  # NDRPDR sel - new1908.1
-        - 45  # NDRPDR sel - new1908.1
-        - 46  # NDRPDR sel - new1908.1
-        - 47  # NDRPDR sel - new1908.1
-        - 48  # NDRPDR sel - new1908.1
-        - 49  # NDRPDR sel - new1908.1
-    vpp-performance-changes-2n-skx-ref:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0
-        - 146  # NDRPDR sel - new2001.0
-        - 147  # NDRPDR sel - new2001.0
-        - 148  # NDRPDR sel - new2001.0
-        - 149  # NDRPDR sel - new2001.0
-        - 150  # NDRPDR sel - new2001.0
-        - 151  # NDRPDR sel - new2001.0
-        - 152  # NDRPDR sel - new2001.0
-        - 153  # NDRPDR sel - new2001.0
-        - 154  # NDRPDR sel - new2001.0
-    vpp-performance-changes-2n-skx-cmp:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
-    vpp-performance-changes-2n-skx-cmp-2:
+        - 100 # NDRPDR sel 2001.0-4
+        - 101 # NDRPDR sel 2001.0-4
+        - 102 # NDRPDR sel 2001.0-4
+        - 103 # NDRPDR sel 2001.0-4
+        - 104 # NDRPDR sel 2001.0-4
+        - 105 # NDRPDR sel 2001.0-4
+    vpp-performance-changes-2n-skx-ref:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
         - 92  # NDRPDR sel env 4
         - 93  # NDRPDR sel env 4
         - 94  # NDRPDR sel env 4
-    vpp-performance-changes-2n-skx-cmp-2001.0-4:
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
+    vpp-performance-changes-2n-skx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 100 # NDRPDR sel 2001.0-4
-        - 101 # NDRPDR sel 2001.0-4
-        - 102 # NDRPDR sel 2001.0-4
-        - 103 # NDRPDR sel 2001.0-4
-        - 104 # NDRPDR sel 2001.0-4
-        - 105 # NDRPDR sel 2001.0-4
-
-#    vpp-performance-changes-nfv-2n-skx-ref:
-#      csit-vpp-perf-verify-2001-2n-skx:
-#        - 30  # NFV
-#        - 31  # NFV
-#    vpp-performance-changes-nfv-2n-skx-cmp:
-#      csit-vpp-perf-report-iterative-2005-2n-skx:
-#        - 43  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 7   # NDRPDR sel
-#        - 78  # nf-density-sel
-#        - 83  # nf-density-sel
+        - 88  # NDRPDR sel env 4
+        - 89  # NDRPDR sel env 4
+        - 90  # NDRPDR sel env 4
+        - 91  # NDRPDR sel env 4
+        - 92  # NDRPDR sel env 4
+        - 93  # NDRPDR sel env 4
+        - 94  # NDRPDR sel env 4
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
 
-    vpp-performance-changes-2n-clx-ref:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # NDRPDR sel
-    vpp-performance-changes-2n-clx-cmp:
+    vpp-performance-changes-2n-clx-h1:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 32  # NDRPDR sel ???
-        - 33  # NDRPDR sel ???
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 51  # NDRPDR sel
-    vpp-performance-changes-2n-clx-cmp-2:
+        - 73  # NDRPDR sel 2001.0-4
+        - 74  # NDRPDR sel 2001.0-4
+        - 75  # NDRPDR sel 2001.0-4
+        - 76  # NDRPDR sel 2001.0-4
+        - 77  # NDRPDR sel 2001.0-4
+        - 78  # NDRPDR sel 2001.0-4
+        - 79  # NDRPDR sel 2001.0-4
+        - 80  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-2n-clx-ref:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
         - 68  # NDRPDR sel env 4
         - 69  # NDRPDR sel env 4
         - 70  # NDRPDR sel env 4
-    vpp-performance-changes-2n-clx-cmp-2001.0-4:
+        - 103 # NDRPDR sel env 4
+        - 104 # NDRPDR sel env 4
+    vpp-performance-changes-2n-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 73  # NDRPDR sel 2001.0-4
-        - 74  # NDRPDR sel 2001.0-4
-        - 75  # NDRPDR sel 2001.0-4
-        - 76  # NDRPDR sel 2001.0-4
-        - 77  # NDRPDR sel 2001.0-4
-        - 78  # NDRPDR sel 2001.0-4
-        - 79  # NDRPDR sel 2001.0-4
-        - 80  # NDRPDR sel 2001.0-4
+        - 62  # NDRPDR sel env 4
+        - 63  # NDRPDR sel env 4
+        - 64  # NDRPDR sel env 4
+        - 65  # NDRPDR sel env 4
+        - 66  # NDRPDR sel env 4
+        - 68  # NDRPDR sel env 4
+        - 69  # NDRPDR sel env 4
+        - 70  # NDRPDR sel env 4
+        - 103 # NDRPDR sel env 4
+        - 104 # NDRPDR sel env 4
 
     vpp-performance-changes-2n-dnv-h1:
-      csit-vpp-perf-verify-1908-2n-dnv:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-    vpp-performance-changes-2n-dnv-ref:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 11  # NDRPDR sel
         - 13  # NDRPDR sel
         - 16  # NDRPDR sel
-    vpp-performance-changes-2n-dnv-cmp:
+    vpp-performance-changes-2n-dnv-ref:
       csit-vpp-perf-report-iterative-2005-2n-dnv:
         - 3   # NDRPDR sel
         - 6   # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
-
-    vpp-performance-changes-3n-dnv-h1:
-      csit-vpp-perf-verify-1908-3n-dnv:
+    vpp-performance-changes-2n-dnv-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-dnv:
+      csit-vpp-perf-report-iterative-2005-2n-dnv:
+        - 3   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-    vpp-performance-changes-3n-dnv-ref:
+
+    vpp-performance-changes-3n-dnv-h1:
       csit-vpp-perf-verify-2001-3n-dnv:
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
         - 18  # NDRPDR sel
-    vpp-performance-changes-3n-dnv-cmp:
+    vpp-performance-changes-3n-dnv-ref:
       csit-vpp-perf-report-iterative-2005-3n-dnv:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-
-    vpp-performance-changes-3n-tsh-h1:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-ref:
-      csit-vpp-perf-verify-2001-3n-tsh:
+    vpp-performance-changes-3n-dnv-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-dnv:
+      csit-vpp-perf-report-iterative-2005-3n-dnv:
+        - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
         - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 21  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-cmp:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 21  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-cmp-2:
+
+    vpp-performance-changes-3n-tsh-h1:
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 28  # NDRPDR sel 2001.0-4
+        - 29  # NDRPDR sel 2001.0-4
+        - 31  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-3n-tsh-ref:
       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
-    vpp-performance-changes-3n-tsh-cmp-2001.0-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
+    vpp-performance-changes-3n-tsh-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 28  # NDRPDR sel 2001.0-4
-        - 29  # NDRPDR sel 2001.0-4
-        - 31  # NDRPDR sel 2001.0-4
+        - 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
 
     vpp-soak-vs-ndr-2n-skx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
         - 92  # NDRPDR sel env 4
         - 93  # NDRPDR sel env 4
         - 94  # NDRPDR sel env 4
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
     vpp-soak-vs-ndr-2n-skx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 122 # Soak
         - 123 # Soak
     vpp-soak-vs-ndr-2n-skx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
         - 92  # NDRPDR sel env 4
         - 93  # NDRPDR sel env 4
         - 94  # NDRPDR sel env 4
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
         - 122 # Soak
         - 123 # Soak
 
     vpp-soak-vs-ndr-2n-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
         - 68  # NDRPDR sel env 4
         - 69  # NDRPDR sel env 4
         - 70  # NDRPDR sel env 4
+        - 103 # NDRPDR sel env 4
+        - 104 # NDRPDR sel env 4
     vpp-soak-vs-ndr-2n-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 101 # Soak
+        - 102 # Soak
     vpp-soak-vs-ndr-2n-clx:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
         - 68  # NDRPDR sel env 4
         - 69  # NDRPDR sel env 4
         - 70  # NDRPDR sel env 4
+        - 103 # NDRPDR sel env 4
+        - 104 # NDRPDR sel env 4
         - 101 # Soak
+        - 102 # Soak
 
     vpp-performance-changes-3n-hsw-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 39  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-verify-2001-3n-hsw:
         - 17  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-cmp:
+    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 13  # MRR
-    vpp-performance-changes-3n-hsw-mrr-cmp-2:
+        - 30  # MRR env 4
+    vpp-performance-changes-3n-hsw-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
 
-#    vpp-performance-changes-3n-skx-mrr-h1:
-#      csit-vpp-perf-verify-1908-3n-skx:
-#        - 36  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-ref:
+    vpp-performance-changes-3n-skx-mrr-h1:
       csit-vpp-perf-verify-2001-3n-skx:
         - 50  # MRR sel
         - 53  # MRR sel addition
-    vpp-performance-changes-3n-skx-mrr-cmp:
+    vpp-performance-changes-3n-skx-mrr-ref:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 6   # MRR sel
-    vpp-performance-changes-3n-skx-mrr-cmp-2:
+        - 49  # MRR sel env 4
+    vpp-performance-changes-3n-skx-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
-#    vpp-performance-changes-2n-skx-mrr-h1:
-#      csit-vpp-perf-verify-1908-2n-skx:
-#        - 69  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-ref:
+    vpp-performance-changes-2n-skx-mrr-h1:
       csit-vpp-perf-verify-2001-2n-skx:
         - 101 # MRR sel
         - 128 # MRR sel addition
-    vpp-performance-changes-2n-skx-mrr-cmp:
+    vpp-performance-changes-2n-skx-mrr-ref:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 42  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-cmp-2:
+        - 99  # MRR sel env 4
+    vpp-performance-changes-2n-skx-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
 
-    vpp-performance-changes-2n-clx-mrr-ref:
+    vpp-performance-changes-2n-clx-mrr-h1:
       csit-vpp-perf-verify-2001-2n-clx:
         - 39  # MRR
-    vpp-performance-changes-2n-clx-mrr-cmp:
+    vpp-performance-changes-2n-clx-mrr-ref:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 12   # MRR
-    vpp-performance-changes-2n-clx-mrr-cmp-2:
+        - 72   # MRR sel env 4
+    vpp-performance-changes-2n-clx-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72   # MRR sel env 4
 
 #        - 71  # NFV MRR
 
     vpp-performance-changes-2n-dnv-mrr-h1:
-      csit-vpp-perf-verify-1908-2n-dnv:
-        - 11  # MRR sel
-    vpp-performance-changes-2n-dnv-mrr-ref:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 12  # MRR sel
+    vpp-performance-changes-2n-dnv-mrr-ref:
+      csit-vpp-perf-report-iterative-2005-2n-dnv:
+        - 15  # MRR sel
     vpp-performance-changes-2n-dnv-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-dnv:
       csit-vpp-perf-report-iterative-2005-2n-dnv:
         - 15  # MRR sel
 
     vpp-performance-changes-3n-dnv-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-dnv:
-        - 17  # MRR sel
-    vpp-performance-changes-3n-dnv-mrr-ref:
       csit-vpp-perf-verify-2001-3n-dnv:
         - 11  # MRR sel
+    vpp-performance-changes-3n-dnv-mrr-ref:
+      csit-vpp-perf-report-iterative-2005-3n-dnv:
+        - 8   # MRR
     vpp-performance-changes-3n-dnv-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-dnv:
       csit-vpp-perf-report-iterative-2005-3n-dnv:
         - 8   # MRR
 
     vpp-performance-changes-3n-tsh-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 17  # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-ref:
       csit-vpp-perf-verify-2001-3n-tsh:
         - 9   # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-cmp:
+    vpp-performance-changes-3n-tsh-mrr-ref:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 10  # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-cmp-2:
+        - 27  # MRR sel env 4
+    vpp-performance-changes-3n-tsh-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-tsh:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
         - 27  # MRR sel env 4
 
     dpdk-performance-changes-3n-hsw-h1:
-      csit-dpdk-perf-verify-1908-3n-hsw:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-    dpdk-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-verify-2001-3n-hsw:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
+    dpdk-performance-changes-3n-hsw-ref:
+      csit-dpdk-perf-report-iterative-2005-3n-hsw:
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
     dpdk-performance-changes-3n-hsw-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
         - 26  # NDRPDR iter
         - 34  # NDRPDR iter
 
     dpdk-performance-changes-3n-skx-h1:
-      csit-dpdk-perf-verify-1908-3n-skx:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-    dpdk-performance-changes-3n-skx-ref:
       csit-dpdk-perf-verify-2001-3n-skx:
         - 29  # NDRPDR sel xxv710
         - 33  # NDRPDR sel xxv710
         - 46  # NDRPDR sel x710
         - 47  # NDRPDR sel x710
         - 48  # NDRPDR sel x710
+    dpdk-performance-changes-3n-skx-ref:
+      csit-dpdk-perf-report-iterative-2005-3n-skx:
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
+        - 35  # NDRPDR iter
+        - 36  # NDRPDR iter
+        - 37  # NDRPDR iter
     dpdk-performance-changes-3n-skx-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
         - 37  # NDRPDR iter
 
     dpdk-performance-changes-2n-skx-h1:
-      csit-dpdk-perf-verify-1908-2n-skx:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-    dpdk-performance-changes-2n-skx-ref:
       csit-dpdk-perf-verify-2001-2n-skx:
         - 35  # NDRPDR sel xxv710
         - 36  # NDRPDR sel xxv710
         - 50  # NDRPDR sel x710
         - 51  # NDRPDR sel x710
         - 54  # NDRPDR sel x710
+    dpdk-performance-changes-2n-skx-ref:
+      csit-dpdk-perf-report-iterative-2005-2n-skx:
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
     dpdk-performance-changes-2n-skx-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
 
-    dpdk-performance-changes-2n-clx-ref:
+    dpdk-performance-changes-2n-clx-h1:
       csit-dpdk-perf-verify-2001-2n-clx:
         - 15  # NDRPDR sel
         - 16  # NDRPDR sel
         - 32  # NDRPDR sel
         - 33  # NDRPDR sel
         - 34  # NDRPDR sel
+    dpdk-performance-changes-2n-clx-ref:
+      csit-dpdk-perf-report-iterative-2005-2n-clx:
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
     dpdk-performance-changes-2n-clx-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
 
-    dpdk-performance-changes-2n-dnv-ref:
+    dpdk-performance-changes-2n-dnv-h1:
       csit-dpdk-perf-verify-2001-2n-dnv:
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
         - 18  # NDRPDR sel
+    dpdk-performance-changes-2n-dnv-ref:
+      csit-dpdk-perf-report-iterative-2005-2n-dnv:
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
     dpdk-performance-changes-2n-dnv-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-dnv:
       csit-dpdk-perf-report-iterative-2005-2n-dnv:
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
 
-    dpdk-performance-changes-3n-dnv-ref:
+    dpdk-performance-changes-3n-dnv-h1:
       csit-dpdk-perf-verify-2001-3n-dnv:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
         - 22  # NDRPDR sel
+    dpdk-performance-changes-3n-dnv-ref:
+      csit-dpdk-perf-report-iterative-2005-3n-dnv:
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 16  # NDRPDR sel
     dpdk-performance-changes-3n-dnv-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-dnv:
       csit-dpdk-perf-report-iterative-2005-3n-dnv:
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 14  # NDRPDR sel
         - 16  # NDRPDR sel
 
-    dpdk-performance-changes-3n-tsh-ref:
+    dpdk-performance-changes-3n-tsh-h1:
       csit-dpdk-perf-verify-2001-3n-tsh:
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
         - 18  # NDRPDR sel
+    dpdk-performance-changes-3n-tsh-ref:
+      csit-dpdk-perf-report-iterative-2005-3n-tsh:
+        - 5   # NDRPDR sel
     dpdk-performance-changes-3n-tsh-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-tsh:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
 
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 20  # NDRPDR sel env 4
         - 21  # NDRPDR sel env 4
         - 28  # NDRPDR sel env 4
         - 29  # NDRPDR sel env 4
     vpp-compare-testbeds-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
         - 44  # NDRPDR sel env 4
         - 45  # NDRPDR sel env 4
         - 47  # NDRPDR sel env 4
+        - 55  # NDRPDR sel env 4
+        - 56  # NDRPDR sel env 4
+        - 57  # NDRPDR sel env 4
+        - 61  # NDRPDR sel env 4
+        - 62  # NDRPDR sel env 4
 
     vpp-compare-testbeds-skx-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
         - 92  # NDRPDR sel env 4
         - 93  # NDRPDR sel env 4
         - 94  # NDRPDR sel env 4
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
     vpp-compare-testbeds-skx-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
         - 68  # NDRPDR sel env 4
         - 69  # NDRPDR sel env 4
         - 70  # NDRPDR sel env 4
+        - 103 # NDRPDR sel env 4
+        - 104 # NDRPDR sel env 4
 
     vpp-compare-testbeds-hsw-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 20  # NDRPDR sel env 4
         - 21  # NDRPDR sel env 4
         - 28  # NDRPDR sel env 4
         - 29  # NDRPDR sel env 4
     vpp-compare-testbeds-hsw-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 62  # NDRPDR sel env 4
         - 63  # NDRPDR sel env 4
         - 68  # NDRPDR sel env 4
         - 69  # NDRPDR sel env 4
         - 70  # NDRPDR sel env 4
+        - 103 # NDRPDR sel env 4
+        - 104 # NDRPDR sel env 4
 
     vpp-compare-testbeds-mrr-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
     vpp-compare-testbeds-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
 
     vpp-compare-testbeds-mrr-skx-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
     vpp-compare-testbeds-mrr-skx-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72  # MRR env 4
 
     vpp-compare-testbeds-mrr-hsw-clx-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-hsw:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
         - 30  # MRR env 4
     vpp-compare-testbeds-mrr-hsw-clx-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-clx:
       csit-vpp-perf-report-iterative-2005-2n-clx:
         - 72  # MRR env 4
 
     dpdk-compare-testbeds-ref:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-hsw:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 25  # NDRPDR iter
         - 26  # NDRPDR iter
         - 33  # NDRPDR iter
         - 34  # NDRPDR iter
     dpdk-compare-testbeds-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
         - 37  # NDRPDR iter
 
     dpdk-compare-testbeds-skx-clx-ref:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
     dpdk-compare-testbeds-skx-clx-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-clx:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
     # Compare topologies
 
     vpp-compare-topologies-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 42  # NDRPDR sel env 4
         - 43  # NDRPDR sel env 4
         - 44  # NDRPDR sel env 4
         - 45  # NDRPDR sel env 4
         - 47  # NDRPDR sel env 4
+        - 55  # NDRPDR sel env 4
+        - 56  # NDRPDR sel env 4
+        - 57  # NDRPDR sel env 4
+        - 61  # NDRPDR sel env 4
+        - 62  # NDRPDR sel env 4
     vpp-compare-topologies-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 88  # NDRPDR sel env 4
         - 89  # NDRPDR sel env 4
         - 92  # NDRPDR sel env 4
         - 93  # NDRPDR sel env 4
         - 94  # NDRPDR sel env 4
+        - 125 # NDRPDR sel env 4
+        - 126 # NDRPDR sel env 4
+        - 127 # NDRPDR sel env 4
 
     vpp-compare-topologies-mrr-ref:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-3n-skx:
       csit-vpp-perf-report-iterative-2005-3n-skx:
         - 49  # MRR sel env 4
     vpp-compare-topologies-mrr-cmp:
+      # TODO: Replace:
+      # csit-vpp-perf-report-iterative-2009-2n-skx:
       csit-vpp-perf-report-iterative-2005-2n-skx:
         - 99  # MRR sel env 4
 
     dpdk-compare-topologies-ref:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-3n-skx:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
         - 36  # NDRPDR iter
         - 37  # NDRPDR iter
     dpdk-compare-topologies-cmp:
+      # TODO: Replace:
+      # csit-dpdk-perf-report-iterative-2009-2n-skx:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
         - 20  # NDRPDR iter
         - 21  # NDRPDR iter
 
   builds:
 
-    csit-vpp-perf-verify-1908-3n-hsw:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 39  # MRR sel
     csit-vpp-perf-verify-2001-3n-hsw:
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 32  # NDRPDR sel
-      - 34  # NDRPDR sel
       - 17  # MRR sel
     csit-vpp-perf-report-iterative-2005-3n-hsw:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
       - 20  # NDRPDR sel env 4
       - 21  # NDRPDR sel env 4
       - 22  # NDRPDR sel env 4
       - 106 # vhost-00
       - 107 # vhost-01
       - 109 # vhost-02
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-3n-hsw:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-3n-hsw:
+
+    # TODO: Add for hoststack:
+    # csit-vpp-perf-report-iterative-2009-3n-hsw: OR
+    # csit-vpp-perf-verify-2009-3n-hsw:
 
-    csit-vpp-perf-verify-1908_1-3n-skx:
-      - 26  # NDRPDR sel - new1908.1
-      - 27  # NDRPDR sel - new1908.1
-      - 28  # NDRPDR sel - new1908.1
-      - 29  # NDRPDR sel - new1908.1
-      - 30  # NDRPDR sel - new1908.1
-      - 31  # NDRPDR sel - new1908.1
-      - 33  # NDRPDR sel - new1908.1
-      - 34  # NDRPDR sel - new1908.1
-      - 35  # NDRPDR sel - new1908.1
-      - 36  # NDRPDR sel - new1908.1
     csit-vpp-perf-verify-2001-3n-skx:
-      - 69  # NDRPDR sel - new2001.0
-      - 71  # NDRPDR sel - new2001.0
-      - 72  # NDRPDR sel - new2001.0
-      - 76  # NDRPDR sel - new2001.0
-      - 77  # NDRPDR sel - new2001.0
-      - 78  # NDRPDR sel - new2001.0
-      - 80  # NDRPDR sel - new2001.0
       - 50  # MRR sel
       - 53  # MRR sel addition
     csit-vpp-perf-report-iterative-2005-3n-skx:
       - 33  # NDRPDR sel
       - 28  # NDRPDR sel
       - 34  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 37  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
       - 42  # NDRPDR sel env 4
       - 43  # NDRPDR sel env 4
       - 44  # NDRPDR sel env 4
       - 45  # NDRPDR sel env 4
       - 47  # NDRPDR sel env 4
+      - 55  # NDRPDR sel env 4
+      - 56  # NDRPDR sel env 4
+      - 57  # NDRPDR sel env 4
+      - 61  # NDRPDR sel env 4
+      - 62  # NDRPDR sel env 4
       - 50  # NDRPDR sel 2001.0-4
       - 51  # NDRPDR sel 2001.0-4
       - 52  # NDRPDR sel 2001.0-4
       - 53  # NDRPDR sel 2001.0-4
       - 54  # NDRPDR sel 2001.0-4
-      - 6   # MRR sel
       - 49  # MRR sel env 4
-#    csit-vpp-perf-report-coverage-2005-3n-skx:
-#      - 10  # perf-full-3n-skx-crypto_I
-#      - 11  # perf-full-3n-skx-crypto_II
-#      - 12  # perf-full-3n-skx-crypto_III
-#      - 5   # perf-full-3n-skx-ip4_I
-#      - 14  # perf-full-3n-skx-ip4_II
-#      - 7   # perf-full-3n-skx-ip4_III
-#      - 15  # perf-full-3n-skx-ip4_IV
-#      - 16  # perf-full-3n-skx-ip4_V
-#      - 17  # perf-full-3n-skx-ip4_VI
-#      - 18  # perf-full-3n-skx-ip4_VII
-#      - 19  # perf-full-3n-skx-ip4_VIII
-#      - 20  # perf-full-3n-skx-ip4_IX
-#      - 24  # perf-full-3n-skx-ip6_I
-#      - 25  # perf-full-3n-skx-ip6_II
-#      - 21  # perf-full-3n-skx-ip4tunnels-I
-#      - 22  # perf-full-3n-skx-ip4tunnels-II
-#      - 23  # perf-full-3n-skx-ip4tunnels-III
-#      - 26  # perf-full-3n-skx-ip6tunnels-I
-#      - 28  # perf-full-3n-skx-l2_II
-#      - 29  # perf-full-3n-skx-l2_III
-#      - 30  # perf-full-3n-skx-l2_IV
-#      - 32  # perf-full-3n-skx-l2_VI
-#      - 33  # perf-full-3n-skx-l2_VII
-#      - 34  # perf-full-3n-skx-l2_VIII
-#      - 35  # perf-full-3n-skx-l2_IX
-#      - 36  # perf-full-3n-skx-l2_X
-#      - 37  # perf-full-3n-skx-l2_XI
-#      - 38  # perf-full-3n-skx-memif
-#      - 39  # perf-full-3n-skx-srv6-I
-#      - 40  # perf-full-3n-skx-srv6-II
-#      - 43  # perf-full-3n-skx-vhost-III
-
-    csit-vpp-perf-verify-1908_1-2n-skx:
-      - 39  # NDRPDR sel - new1908.1
-      - 40  # NDRPDR sel - new1908.1
-      - 41  # NDRPDR sel - new1908.1
-      - 43  # NDRPDR sel - new1908.1
-      - 44  # NDRPDR sel - new1908.1
-      - 45  # NDRPDR sel - new1908.1
-      - 46  # NDRPDR sel - new1908.1
-      - 47  # NDRPDR sel - new1908.1
-      - 48  # NDRPDR sel - new1908.1
-      - 49  # NDRPDR sel - new1908.1
+    csit-vpp-perf-report-coverage-2005-3n-skx:
+      - 45  # crypto-00
+      - 46  # crypto-01
+      - 47  # crypto-02
+      - 83  # crypto-03
+      - 50  # ip4-00
+      - 51  # ip4-01
+      - 52  # ip4-02
+      - 53  # ip4-03
+      - 54  # ip4-04
+      - 55  # ip4-05
+      - 56  # ip4-06
+      - 57  # ip4-07
+      - 58  # ip4-08
+      - 59  # ip4tun-00
+      - 60  # ip4tun-01
+      - 61  # ip4tun-02
+      - 62  # ip6-00
+      - 63  # ip6-01
+      - 64  # ip6tun-00
+      - 65  # l2-00
+      - 66  # l2-01
+      - 67  # l2-02
+      - 68  # l2-03
+      - 69  # l2-04
+      - 84  # l2-05
+      - 71  # l2-06
+      - 72  # l2-07
+      - 73  # l2-08
+      - 85  # l2-09
+      - 75  # l2-10
+      - 76  # memif-00
+      - 77  # srv6-00
+      - 78  # srv6-01
+      - 88  # vhost-00
+      - 89  # vhost-01
+      - 81  # vhost-02
+      - 83  # vhost-03
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-3n-skx:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-3n-skx:
+
     csit-vpp-perf-verify-2001-2n-skx:
-      - 143  # NDRPDR sel - new2001.0
-      - 146  # NDRPDR sel - new2001.0
-      - 147  # NDRPDR sel - new2001.0
-      - 148  # NDRPDR sel - new2001.0
-      - 149  # NDRPDR sel - new2001.0
-      - 150  # NDRPDR sel - new2001.0
-      - 151  # NDRPDR sel - new2001.0
-      - 152  # NDRPDR sel - new2001.0
-      - 153  # NDRPDR sel - new2001.0
-      - 154  # NDRPDR sel - new2001.0
       - 101  # MRR sel - old
       - 128  # MRR sel addition - old
     csit-vpp-perf-report-iterative-2005-2n-skx:
-      - 43  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 65  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 55  # NDRPDR sel
-      - 67  # NDRPDR sel
-      - 75  # NDRPDR sel
-      - 76  # NDRPDR sel
-      - 73  # NDRPDR sel
       - 88  # NDRPDR sel env 4
       - 89  # NDRPDR sel env 4
       - 90  # NDRPDR sel env 4
       - 92  # NDRPDR sel env 4
       - 93  # NDRPDR sel env 4
       - 94  # NDRPDR sel env 4
+      - 125 # NDRPDR sel env 4
+      - 126 # NDRPDR sel env 4
+      - 127 # NDRPDR sel env 4
       - 100 # NDRPDR sel 2001.0-4
       - 101 # NDRPDR sel 2001.0-4
       - 102 # NDRPDR sel 2001.0-4
       - 103 # NDRPDR sel 2001.0-4
       - 104 # NDRPDR sel 2001.0-4
       - 105 # NDRPDR sel 2001.0-4
-      - 42  # MRR sel
       - 99  # MRR sel env 4
       - 106 # Reconf env 4
       - 107 # Reconf env 4
       - 123 # Soak
       - 113 # nf-density-sel env 4
       - 114 # nf-density-sel env 4
+      - 124 # nf-density-sel env 4
+      - 128 # nf-density-sel env 4
+      - 129 # nf-density-sel env 4
+      - 131 # nf-density-sel env 4
+      - 132 # nf-density-sel env 4
+      - 135 # nf-density-sel env 4
+      - 136 # nf-density-sel env 4
+      - 139 # nf-density-sel env 4
       - 115 # MRR nf-density-sel env 4
-#    csit-vpp-perf-report-coverage-2005-2n-skx:
-#      - 11  # perf-full-2n-skx-ip4_I
-#      - 3   # perf-full-2n-skx-ip4_II
-#      - 18  # perf-full-2n-skx-ip4_III
-#      - 19  # perf-full-2n-skx-ip4_IV
-#      - 5   # perf-full-2n-skx-ip4_V
-#      - 20  # perf-full-2n-skx-ip4_VI
-#      - 7   # perf-full-2n-skx-ip6_I
-#      - 21  # perf-full-2n-skx-ip6_II
-#      - 9   # perf-full-2n-skx-l2_I
-#      - 22  # perf-full-2n-skx-l2_II
-#      - 23  # perf-full-2n-skx-memif
-#      - 24  # perf-full-2n-skx-loadbalancer
-#      - 25  # perf-full-2n-skx-vhost I
-#      - 26  # perf-full-2n-skx-vhost II
-#      - 27  # perf-full-2n-skx-vts
-
-    csit-vpp-perf-verify-1908_1-2n-clx:
-      - 5  # NDRPDR sel
-      - 6  # NDRPDR sel
-      - 7  # NDRPDR sel
-      - 8  # NDRPDR sel
-      - 9  # NDRPDR sel
+    csit-vpp-perf-report-coverage-2005-2n-skx:
+      - 28  # ip4-00
+      - 29  # ip4-01
+      - 30  # ip4-02
+      - 31  # ip4-03
+      - 32  # ip4-04
+      - 33  # ip4-05
+      - 34  # ip6-00
+      - 35  # ip6-01
+      - 36  # l2-00
+      - 37  # l2-01
+      - 38  # lb-00
+      - 39  # memif-00
+      - 40  # vhost-00
+      - 41  # vhost-01
+      - 42  # vts-00
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-2n-skx:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-2n-skx:
+
     csit-vpp-perf-verify-2001-2n-clx:
-      - 28  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 32  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 45  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-      - 49  # NDRPDR sel
       - 39  # MRR
     csit-vpp-perf-report-iterative-2005-2n-clx:
-      - 7   # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 32  # NDRPDR sel ???
-      - 33  # NDRPDR sel ???
-      - 39  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 50  # NDRPDR sel
-      - 51  # NDRPDR sel
       - 62  # NDRPDR sel env 4
       - 63  # NDRPDR sel env 4
       - 64  # NDRPDR sel env 4
       - 68  # NDRPDR sel env 4
       - 69  # NDRPDR sel env 4
       - 70  # NDRPDR sel env 4
+      - 103 # NDRPDR sel env 4
+      - 104 # NDRPDR sel env 4
       - 73  # NDRPDR sel 2001.0-4
       - 74  # NDRPDR sel 2001.0-4
       - 75  # NDRPDR sel 2001.0-4
       - 78  # NDRPDR sel 2001.0-4
       - 79  # NDRPDR sel 2001.0-4
       - 80  # NDRPDR sel 2001.0-4
-      - 12  # MRR
       - 72  # MRR env 4
       - 81  # Reconf env 4
       - 82  # Reconf env 4
       - 89  # Reconf env 4
       - 90  # Reconf env 4
       - 101 # Soak
+      - 102 # Soak
       - 91  # nfv-density-00 env 4
       - 92  # nfv-density-00 env 4
       - 93  # nfv-density-00 env 4
       - 98  # nfv-density-00 env 4
       - 99  # nfv-density-00 env 4
       - 100 # nfv-density-00 env 4
+      - 105 # nfv-density-00 env 4
+      - 106 # nfv-density-00 env 4
+      - 108 # nfv-density-00 env 4
       - 96  # MRR nfv-density-00 env 4
-#    csit-vpp-perf-report-coverage-2005-2n-clx:
-#      - 21  # perf-full-2n-clx-ip4_I
-#      - 2   # perf-full-2n-clx-ip4_II
-#      - 3   # perf-full-2n-clx-ip4_III
-#      - 4   # perf-full-2n-clx-ip4_IV
-#      - 5   # perf-full-2n-clx-ip4_V
-#      - 6   # perf-full-2n-clx-ip4_VI
-#      - 7   # perf-full-2n-clx-ip6_I
-#      - 16  # perf-full-2n-clx-ip6_II
-#      - 23  # perf-full-2n-clx-l2_I
-#      - 10  # perf-full-2n-clx-l2_II
-#      - 11  # perf-full-2n-clx-memif
-#      - 12  # perf-full-2n-clx-loadbalancer
-#      - 13  # perf-full-2n-clx-vhost I
-#      - 22  # perf-full-2n-clx-vhost II
-#      - 15  # perf-full-2n-clx-vts
-
-    csit-vpp-perf-verify-1908-3n-tsh:
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # MRR sel
+    csit-vpp-perf-report-coverage-2005-2n-clx:
+      - 24  # ip4-00
+      - 25  # ip4-01
+      - 26  # ip4-02
+      - 27  # ip4-03
+      - 28  # ip4-04
+      - 29  # ip4-05
+      - 34  # ip6-00
+      - 36  # ip6-01
+      - 31  # l2-00
+      - 41  # l2-01
+      - 39  # lb-00
+      - 37  # memif-00
+      - 32  # vhost-00
+      - 33  # vhost-01
+      - 40  # vts-00
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-2n-clx:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-2n-clx:
+
     csit-vpp-perf-verify-2001-3n-tsh:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 21  # NDRPDR sel
       - 9   # MRR sel
     csit-vpp-perf-report-iterative-2005-3n-tsh:
       - 9   # NDRPDR sel
       - 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
       - 28  # NDRPDR sel 2001.0-4
       - 29  # NDRPDR sel 2001.0-4
       - 31  # NDRPDR sel 2001.0-4
-      - 10  # MRR sel
       - 27  # MRR sel env 4
+    # TODO: Replace:
+    # csit-vpp-perf-report-iterative-2009-3n-tsh:
 
-    csit-vpp-perf-verify-1908-3n-dnv:
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # MRR sel
     csit-vpp-perf-verify-2001-3n-dnv:
       - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 21  # perf-full-3n-dnv-l2_I
       - 22  # perf-full-3n-dnv-l2_II
       - 23  # perf-full-3n-dnv-ip4-tunnels_I
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-3n-dnv:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-3n-dnv:
 
-    csit-vpp-perf-verify-1908-2n-dnv:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # MRR sel
     csit-vpp-perf-verify-2001-2n-dnv:
       - 4   # NDRPDR sel
       - 5   # NDRPDR sel
       - 4   # perf-full-2n-dnv-ip6_II
       - 5   # perf-full-2n-dnv-l2_I
       - 6   # perf-full-2n-dnv-l2_II
+    # TODO: Add:
+    # csit-vpp-perf-report-iterative-2009-2n-dnv:
+    # TODO: Add:
+    # csit-vpp-perf-report-coverage-2009-2n-dnv:
 
-    csit-dpdk-perf-verify-1908-3n-hsw:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
     csit-dpdk-perf-verify-2001-3n-hsw:
       - 4   # NDRPDR sel
       - 5   # NDRPDR sel
       - 32  # NDRPDR iter
       - 33  # NDRPDR iter
       - 34  # NDRPDR iter
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-3n-hsw:
 
-    csit-dpdk-perf-verify-1908-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
     csit-dpdk-perf-verify-2001-3n-skx:
       - 29  # NDRPDR sel xxv710
       - 33  # NDRPDR sel xxv710
       - 35  # NDRPDR iter
       - 36  # NDRPDR iter
       - 37  # NDRPDR iter
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-3n-skx:
 
-    csit-dpdk-perf-verify-1908-2n-skx:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
     csit-dpdk-perf-verify-2001-2n-skx:
       - 35  # NDRPDR sel xxv710
       - 36  # NDRPDR sel xxv710
       - 27  # NDRPDR iter
       - 28  # NDRPDR iter
       - 29  # NDRPDR iter
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-2n-skx:
 
     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:
 
     csit-dpdk-perf-verify-2001-2n-dnv:
       - 9   # NDRPDR sel
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
       - 17  # NDRPDR sel
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-2n-dnv:
 
     csit-dpdk-perf-verify-2001-3n-dnv:
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
       - 16  # NDRPDR sel
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-3n-dnv:
 
     csit-dpdk-perf-verify-2001-3n-tsh:
       - 3   # NDRPDR sel
       - 18  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-3n-tsh:
       - 5   # NDRPDR sel
+    # TODO: Add:
+    # csit-dpdk-perf-report-iterative-2009-3n-tsh:
 
     csit-vpp-device-2005-ubuntu1804-1n-skx:
       - 35
+    # TODO: Add:
+    # csit-vpp-device-2009-ubuntu1804-1n-skx:
 
 - type: "output"
   output: "report"
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
+      data-set: "vpp-performance-changes-3n-hsw-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
+      data-set: "vpp-performance-changes-3n-hsw-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
+      data-set: "vpp-performance-changes-3n-hsw-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 1t1c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 2t2c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 1t1c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca3.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-hsw 2t2c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-hsw-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
+      data-set: "vpp-performance-changes-3n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca2.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 2t1c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 4t2c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: PDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 2t1c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca3.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-skx 4t2c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca3.yaml"
-  legend:
-    - ''
-    - 'Test Case:            Test cases executed for: NDR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c pdr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c ndr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c ndr
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 2t1c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-skx 4t2c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 2n-clx-xxv710 2t1c pdr
-- type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 2t1c pdr"
+  title: "VPP Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 4t2c pdr
+# VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 4t2c pdr"
+  title: "VPP Performance Changes 2n-skx 4t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 2t1c ndr
+# VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 2t1c ndr"
+  title: "VPP Performance Changes 2n-skx 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 4t2c ndr
+# VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 ndr"
+  title: "VPP Performance Changes 2n-skx 4t2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 2t1c pdr-full
+# VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 2t1c pdr-full"
+  title: "VPP Performance Changes 2n-clx-xxv710 2t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-pdr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca3.yaml"
+      compare: 3
+#      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 4t2c pdr-full
+# VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 4t2c pdr-full"
+  title: "VPP Performance Changes 2n-clx-xxv710 4t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-pdr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca3.yaml"
+      compare: 3
+#      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 2t1c ndr-full
+# VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 2t1c ndr-full"
+  title: "VPP Performance Changes 2n-clx-xxv710 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-ndr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca3.yaml"
+      compare: 3
+#      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-xxv710 4t2c ndr-full
+# VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-xxv710 ndr-full"
+  title: "VPP Performance Changes 2n-clx-xxv710 ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-ndr-full"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 2
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca3.yaml"
+      compare: 3
+#      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 ## VPP Performance Changes 2n-clx-x556 2t1c pdr
 #- type: "table"
 #  legend:
 #    - ''
 #    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with x556.'
-#    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+#    - '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.'
 #    - '2005.0-3 vs 2001.0-2: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 ##    - '                RCA1: root cause analysis reference for 2001.0-4 vs 2001.0-2.'
 #  legend:
 #    - ''
 #    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with x556.'
-#    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+#    - '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.'
 #    - '2005.0-3 vs 2001.0-2: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 ##    - '                RCA1: root cause analysis reference for 2001.0-4 vs 2001.0-2.'
 #  legend:
 #    - ''
 #    - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with x556.'
-#    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+#    - '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.'
 #    - '2005.0-3 vs 2001.0-2: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 ##    - '                RCA1: root cause analysis reference for 2001.0-4 vs 2001.0-2.'
 #  legend:
 #    - ''
 #    - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with x556.'
-#    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+#    - '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.'
 #    - '2005.0-3 vs 2001.0-2: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
 ##    - '                RCA1: root cause analysis reference for 2001.0-4 vs 2001.0-2.'
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
+      data-set: "vpp-performance-changes-3n-tsh-ref"
+    - title: "2009.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-  comparisons:
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-tsh 1t1c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-tsh 1t1c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-tsh 2t2c pdr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-tsh 2t2c pdr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-pdr-full"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
     - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-tsh 1t1c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-tsh 1t1c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C'"
-  columns:
-    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-3n-tsh-cmp"
     - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-  comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
-      reference: 2
-      compare: 3
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca3.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
-    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
-
-# VPP Performance Changes 3n-tsh 2t2c ndr-full
-- type: "table"
-  title: "VPP Performance Changes 3n-tsh 2t2c ndr-full"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-ndr-full"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C'"
-  columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2001.0-4"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 4
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
-    - title: "2001.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
-    - title: "2005.0-4 vs 2001.0-4"
-      reference: 3
-      compare: 5
-      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca3.yaml"
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Compares CSIT environments "4" to "3". "3" was discarded as it substantially changed TRex behaviour due to higher number of TRex workers used.'
-    - '2001.0-4 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2005.0-4 vs 2001.0-4: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c mrr
 - type: "table"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
       compare: 3
-      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
-      reference: 1
-      compare: 3
-      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.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 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares VPP code current vs previous in the current CSIT environment.'
 
 ## VPP Performance Changes 2n-clx-x556 2t1c mrr
 #- type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-3"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2005.0-3 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-3"
       reference: 2
       compare: 3
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-3 vs 2001.0-2: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-4 vs 2005.0-3: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "1908.1-2"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - 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"
-    - title: "2005.0-3"
+    - title: "2009.0-4"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-cmp-2"
   comparisons:
-    - title: "2005.0-4 vs 2005.0-3"
-      reference: 3
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca1.yaml"
-    - title: "2005.0-4 vs 2001.0-2"
+    - title: "2009.0-4 vs 2005.0-4"
       reference: 2
-      compare: 4
-      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca2.yaml"
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for 2020-03-27, "3" for 2020-06-11, "4" for 2020-06-24).'
+    - '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.'
-    - '2005.0-4 vs 2005.0-3: Environment version "3" was found to be incompatible with "2" due to higher number of TRex workers used.'
-    - '2005.0-4 vs 2001.0-2: Used as a reference to compare benchmark results of VPP current release v20.05.0 vs previous release v20.01.0.'
+    - '2009.0-4 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 1t1c pdr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c pdr
 - type: "table"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c ndr
 - type: "table"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c ndr
 - type: "table"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-2n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-2n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-2n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-2n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-dnv-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-dnv-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - ""
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 - type: "table"
     - "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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-snat44det-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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-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-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-1t1c-ethip4udp-snat44det-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-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-1t1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-tsh-x520-64b-features-ip4routing-base-ixgbe-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-tsh-x520-64b-features-ip4routing-base-ixgbe-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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-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.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr-tsa"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-features-snat44det-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"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-features-snat44det-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"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-features-snat44det-scale-avf-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
   algorithm: "plot_perf_box_name"
     - "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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-snat44det-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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-snat44det-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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-features-snat44det-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"
+  layout:
+    title: "2n-clx-xxv710-64b-features-snat44det-scale-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-features-snat44det-scale-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-features-snat44det-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"
+  layout:
+    title: "2n-clx-xxv710-64b-features-snat44det-scale-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     - "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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-snat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-snat44det-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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   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-Ip4Base-Nat44-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-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"
   layout:
     title: "2n-clx-cx556a-64b-rdma-ethip4-features-pdr"
     layout: "plot-throughput-speedup-analysis"