Report: Add latency graphs for NAT44 tput tests
[csit.git] / resources / tools / presentation / specification.yaml
index 854c5f7..759204c 100644 (file)
@@ -34,6 +34,7 @@
     DIR[DTR,PERF,DPDK,2N,DNV]: "{DIR[DTR]}/dpdk_performance_results_2n_dnv"
     DIR[DTR,PERF,DPDK,3N,DNV]: "{DIR[DTR]}/dpdk_performance_results_3n_dnv"
     DIR[DTR,PERF,DPDK,3N,TSH]: "{DIR[DTR]}/dpdk_performance_results_3n_tsh"
+    DIR[DTR,PERF,DPDK,2N,TX2]: "{DIR[DTR]}/dpdk_performance_results_2n_tx2"
     DIR[DTR,PERF,VPP,ALL]: "{DIR[DTR]}/vpp_performance_results"
     DIR[DTR,PERF,VPP,3N,HSW]: "{DIR[DTR]}/vpp_performance_results_3n_hsw"
     DIR[DTR,PERF,VPP,3N,SKX]: "{DIR[DTR]}/vpp_performance_results_3n_skx"
@@ -41,6 +42,7 @@
     DIR[DTR,PERF,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_performance_results_2n_zn2"
     DIR[DTR,PERF,VPP,2N,CLX]: "{DIR[DTR]}/vpp_performance_results_2n_clx"
     DIR[DTR,PERF,VPP,3N,TSH]: "{DIR[DTR]}/vpp_performance_results_3n_tsh"
+    DIR[DTR,PERF,VPP,2N,TX2]: "{DIR[DTR]}/vpp_performance_results_2n_tx2"
     DIR[DTR,PERF,VPP,3N,DNV]: "{DIR[DTR]}/vpp_performance_results_3n_dnv"
     DIR[DTR,PERF,VPP,2N,DNV]: "{DIR[DTR]}/vpp_performance_results_2n_dnv"
     DIR[DTR,MRR,VPP,ALL]: "{DIR[DTR]}/vpp_mrr_results"
@@ -50,6 +52,7 @@
     DIR[DTR,MRR,VPP,2N,ZN2]: "{DIR[DTR]}/vpp_mrr_results_2n_zn2"
     DIR[DTR,MRR,VPP,2N,CLX]: "{DIR[DTR]}/vpp_mrr_results_2n_clx"
     DIR[DTR,MRR,VPP,3N,TSH]: "{DIR[DTR]}/vpp_mrr_results_3n_tsh"
+    DIR[DTR,MRR,VPP,2N,TX2]: "{DIR[DTR]}/vpp_mrr_results_2n_tx2"
     DIR[DTR,MRR,VPP,3N,DNV]: "{DIR[DTR]}/vpp_mrr_results_3n_dnv"
     DIR[DTR,MRR,VPP,2N,DNV]: "{DIR[DTR]}/vpp_mrr_results_2n_dnv"
     DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTR]}/vpp_device_results_ubuntu"
@@ -63,6 +66,7 @@
     DIR[DTC,PERF,VPP,2N,ZN2]: "{DIR[DTC]}/vpp_performance_configuration_2n_zn2"
     DIR[DTC,PERF,VPP,2N,CLX]: "{DIR[DTC]}/vpp_performance_configuration_2n_clx"
     DIR[DTC,PERF,VPP,3N,TSH]: "{DIR[DTC]}/vpp_performance_configuration_3n_tsh"
+    DIR[DTC,PERF,VPP,2N,TX2]: "{DIR[DTC]}/vpp_performance_configuration_2n_tx2"
     DIR[DTC,PERF,VPP,3N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_3n_dnv"
     DIR[DTC,PERF,VPP,2N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_2n_dnv"
     DIR[DTC,MRR,VPP,ALL]: "{DIR[DTC]}/vpp_mrr_configuration"
@@ -72,6 +76,7 @@
     DIR[DTC,MRR,VPP,2N,ZN2]: "{DIR[DTC]}/vpp_mrr_configuration_2n_zn2"
     DIR[DTC,MRR,VPP,2N,CLX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_clx"
     DIR[DTC,MRR,VPP,3N,TSH]: "{DIR[DTC]}/vpp_mrr_configuration_3n_tsh"
+    DIR[DTC,MRR,VPP,2N,TX2]: "{DIR[DTC]}/vpp_mrr_configuration_2n_tx2"
     DIR[DTC,MRR,VPP,3N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_3n_dnv"
     DIR[DTC,MRR,VPP,2N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_2n_dnv"
     DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu"
@@ -85,6 +90,7 @@
     DIR[DTO,PERF,VPP,2N,ZN2]: "{DIR[DTO]}/vpp_performance_operational_data_2n_zn2"
     DIR[DTO,PERF,VPP,2N,CLX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_clx"
     DIR[DTO,PERF,VPP,3N,TSH]: "{DIR[DTO]}/vpp_performance_operational_data_3n_tsh"
+    DIR[DTO,PERF,VPP,2N,TX2]: "{DIR[DTO]}/vpp_performance_operational_data_2n_tx2"
     DIR[DTO,PERF,VPP,3N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_3n_dnv"
     DIR[DTO,PERF,VPP,2N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_2n_dnv"
 
     # 3n-hsw
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 21  # rls2009 NDRPDR iter env 5
-        - 22  # rls2009 NDRPDR iter env 5
-        - 24  # rls2009 NDRPDR iter env 5
-        - 25  # rls2009 NDRPDR iter env 5
-        - 26  # rls2009 NDRPDR iter env 5
-        - 27  # rls2009 NDRPDR iter env 5
-        - 28  # rls2009 NDRPDR iter env 5
-        - 29  # rls2009 NDRPDR iter env 5
-        - 30  # rls2009 NDRPDR iter env 5
-        - 31  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 64  # rls2101.rel NDRPDR iter env 6
+        - 71  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 74  # rls2101.rel NDRPDR iter env 6
+        - 80  # rls2101.rel NDRPDR iter env 6
+        - 81  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 83  # rls2101.rel NDRPDR iter env 6
+        - 88  # rls2101.rel NDRPDR iter env 6
+        - 89  # rls2101.rel NDRPDR iter env 6
+        - 128 # rls2101.rel NDRPDR iter RND env 6
+        - 129 # rls2101.rel NDRPDR iter RND env 6
+        - 130 # rls2101.rel NDRPDR iter RND env 6
+        - 131 # rls2101.rel NDRPDR iter RND env 6
+        - 132 # rls2101.rel NDRPDR iter RND env 6
+        - 133 # rls2101.rel NDRPDR iter RND env 6
+        - 134 # rls2101.rel NDRPDR iter RND env 6
+        - 135 # rls2101.rel NDRPDR iter RND env 6
+        - 136 # rls2101.rel NDRPDR iter RND env 6
+        - 137 # rls2101.rel NDRPDR iter RND env 6
 
     plot-vpp-hdrh-lat-3n-hsw:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 22  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 89  # rls2101.rel NDRPDR iter env 6
+
+    plot-vpp-hdrh-lat-3n-hsw-rnd:
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 128 # rls2101.rel NDRPDR iter RND env 6
+
+    plot-vpp-ipsec-reconf-3n-hsw:
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 65  # rls2101.rel NDRPDR reconf iter env 6
+        - 68  # rls2101.rel NDRPDR reconf iter env 6
+        - 77  # rls2101.rel NDRPDR reconf iter env 6
+        - 84  # rls2101.rel NDRPDR reconf iter env 6
+        - 90  # rls2101.rel NDRPDR reconf iter env 6
+        - 96  # rls2101.rel NDRPDR reconf iter env 6
+        - 101 # rls2101.rel NDRPDR reconf iter env 6
+        - 104 # rls2101.rel NDRPDR reconf iter env 6
+        - 105 # rls2101.rel NDRPDR reconf iter env 6
+        - 106 # rls2101.rel NDRPDR reconf iter env 6
+        - 107 # rls2101.rel NDRPDR reconf iter env 6
+        - 108 # rls2101.rel NDRPDR reconf iter env 6
+        - 110 # rls2101.rel NDRPDR reconf iter env 6
+        - 111 # rls2101.rel NDRPDR reconf iter env 6
+        - 112 # rls2101.rel NDRPDR reconf iter env 6
+        - 113 # rls2101.rel NDRPDR reconf iter env 6
+        - 114 # rls2101.rel NDRPDR reconf iter env 6
+        - 115 # rls2101.rel NDRPDR reconf iter env 6
+        - 116 # rls2101.rel NDRPDR reconf iter env 6
+        - 117 # rls2101.rel NDRPDR reconf iter env 6
 
     plot-vpp-hoststack-3n-hsw:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 32  # rls2009 Hoststack iter env 5
-        - 33  # rls2009 Hoststack iter env 5
-        - 34  # rls2009 Hoststack iter env 5
-        - 35  # rls2009 Hoststack iter env 5
-        - 36  # rls2009 Hoststack iter env 5
-        - 37  # rls2009 Hoststack iter env 5
-        - 38  # rls2009 Hoststack iter env 5
-        - 39  # rls2009 Hoststack iter env 5
-        - 40  # rls2009 Hoststack iter env 5
-        - 41  # rls2009 Hoststack iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 69  # rls2101.rel Hoststack iter env 6
+        - 70  # rls2101.rel Hoststack iter env 6
+        - 75  # rls2101.rel Hoststack iter env 6
+        - 76  # rls2101.rel Hoststack iter env 6
+        - 78  # rls2101.rel Hoststack iter env 6
+        - 79  # rls2101.rel Hoststack iter env 6
+        - 85  # rls2101.rel Hoststack iter env 6
+        - 86  # rls2101.rel Hoststack iter env 6
+        - 87  # rls2101.rel Hoststack iter env 6
+        - 91  # rls2101.rel Hoststack iter env 6
+        - 92  # rls2101.rel Hoststack iter env 6
+        - 93  # rls2101.rel Hoststack iter env 6
+        - 94  # rls2101.rel Hoststack iter env 6
+        - 95  # rls2101.rel Hoststack iter env 6
+        - 97  # rls2101.rel Hoststack iter env 6
+        - 98  # rls2101.rel Hoststack iter env 6
+        - 99  # rls2101.rel Hoststack iter env 6
+        - 100 # rls2101.rel Hoststack iter env 6
+        - 102 # rls2101.rel Hoststack iter env 6
+        - 103 # rls2101.rel Hoststack iter env 6
 
     plot-dpdk-throughput-latency-3n-hsw:
-      csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 6   # NDRPDR iter env5
-        - 7   # NDRPDR iter env5
-        - 8   # NDRPDR iter env5
-        - 9   # NDRPDR iter env5
-        - 10  # NDRPDR iter env5
-        - 11  # NDRPDR iter env5
-        - 12  # NDRPDR iter env5
-        - 13  # NDRPDR iter env5
-        - 14  # NDRPDR iter env5
-        - 15  # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-3n-hsw:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 16  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
     plot-dpdk-hdrh-lat-3n-hsw:
-      csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 6   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-3n-hsw:
+        - 11  # rls2101 NDRPDR iter env 6
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 26  # rls2009 NDRPDR iter env 5
-        - 27  # rls2009 NDRPDR iter env 5
-        - 28  # rls2009 NDRPDR iter env 5
-        - 29  # rls2009 NDRPDR iter env 5
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 38  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 40  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 47  # rls2101.rel NDRPDR iter env 6
+        - 48  # rls2101.rel NDRPDR iter env 6
+        - 50  # rls2101.rel NDRPDR iter env 6
 
     plot-vpp-hdrh-lat-3n-skx:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 27  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 36  # rls2101.rel NDRPDR iter env 6
 
 #    plot-vpp-nfv-3n-skx-ndrpdr:
 #      # No data
-#      csit-vpp-perf-report-iterative-2009-3n-skx:
+#      csit-vpp-perf-report-iterative-2101-3n-skx:
 
 #    plot-vpp-nfv-3n-skx-mrr:
 #      # No data
-#      csit-vpp-perf-report-iterative-2009-3n-skx:
+#      csit-vpp-perf-report-iterative-2101-3n-skx:
 
     plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 4   # NDRPDR sel env5
-        - 5   # NDRPDR sel env5
-        - 6   # NDRPDR sel env5
-        - 7   # NDRPDR sel env5
-        - 8   # NDRPDR sel env5
-        - 9   # NDRPDR sel env5
-        - 14  # NDRPDR sel env5
-        - 11  # NDRPDR sel env5
-        - 12  # NDRPDR sel env5
-        - 13  # NDRPDR sel env5
+      csit-dpdk-perf-report-iterative-2101-3n-skx:
+        - 12  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 15  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
+        - 22  # rls2101 NDRPDR iter env 6
+        - 25  # rls2101 NDRPDR iter env 6
+        - 26  # rls2101 NDRPDR iter env 6
 
     plot-dpdk-hdrh-lat-3n-skx:
-      csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 4   # NDRPDR sel env5
+      csit-dpdk-perf-report-iterative-2101-3n-skx:
+        - 12  # rls2101 NDRPDR iter env 6
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 42  # rls2009 NDRPDR iter env 5
-        - 43  # rls2009 NDRPDR iter env 5
-        - 44  # rls2009 NDRPDR iter env 5
-        - 46  # rls2009 NDRPDR iter env 5
-        - 48  # rls2009 NDRPDR iter env 5
-        - 110 # rls2009 NDRPDR iter NAT44 env 5
-        - 111 # rls2009 NDRPDR iter NAT44 env 5
-        - 112 # rls2009 NDRPDR iter NAT44 env 5
-        - 113 # rls2009 NDRPDR iter NAT44 env 5
-        - 114 # rls2009 NDRPDR iter NAT44 env 5
-        - 115 # rls2009 NDRPDR iter NAT44 env 5
-        - 116 # rls2009 NDRPDR iter NAT44 env 5
-        - 118 # rls2009 NDRPDR iter NAT44 env 5
-        - 119 # rls2009 NDRPDR iter NAT44 env 5
-        - 121 # rls2009 NDRPDR iter NAT44 env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 69  # rls2101.rel NDRPDR iter env 6
+        - 70  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 76  # rls2101.rel NDRPDR iter env 6
+        - 77  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 85  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 94  # rls2101.rel NDRPDR iter env 6
+        - 89  # rls2101.rel NDRPDR iter RND env 6
+        - 90  # rls2101.rel NDRPDR iter RND env 6
+        - 91  # rls2101.rel NDRPDR iter RND env 6
+        - 92  # rls2101.rel NDRPDR iter RND env 6
+        - 93  # rls2101.rel NDRPDR iter RND env 6
+        - 96  # rls2101.rel NDRPDR iter RND env 6
+        - 98  # rls2101.rel NDRPDR iter RND env 6
+        - 99  # rls2101.rel NDRPDR iter RND env 6
+        - 101 # rls2101.rel NDRPDR iter RND env 6
+        - 102 # rls2101.rel NDRPDR iter RND env 6
+        - 116 # rls2101.rel NDRPDR iter NAT env 6
+        - 117 # rls2101.rel NDRPDR iter NAT env 6
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
+        - 119 # rls2101.rel NDRPDR iter NAT env 6
+        - 120 # rls2101.rel NDRPDR iter NAT env 6
+        - 121 # rls2101.rel NDRPDR iter NAT env 6
+        - 122 # rls2101.rel NDRPDR iter NAT env 6
+        - 123 # rls2101.rel NDRPDR iter NAT env 6
+        - 124 # rls2101.rel NDRPDR iter NAT env 6
+        - 125 # rls2101.rel NDRPDR iter NAT env 6
 
     plot-vpp-hdrh-lat-2n-skx:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 35  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 94  # rls2101.rel NDRPDR iter env 6
 
-    plot-vpp-hdrh-lat-2n-skx-nat44:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 110 # rls2009 NDRPDR iter NAT44 env 5
+    plot-vpp-hdrh-lat-2n-skx-rnd:
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 89  # rls2101.rel NDRPDR iter RND env 6
+
+    plot-vpp-hdrh-lat-2n-skx-nat:
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
 
     plot-vpp-soak-2n-skx:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 33  # rls2009 soak env 5
-        - 34  # rls2009 soak env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 68  # rls2101.rel soak env 6
+        - 73  # rls2101.rel soak env 6
 
     plot-vpp-nfv-2n-skx-ndrpdr:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 38  # rls2009 nf-density iter env 5
-        - 41  # rls2009 nf-density iter env 5
-        - 45  # rls2009 nf-density iter env 5
-        - 47  # rls2009 nf-density iter env 5
-        - 49  # rls2009 nf-density iter env 5
-        - 63  # rls2009 nf-density iter env 5
-        - 65  # rls2009 nf-density iter env 5
-        - 66  # rls2009 nf-density iter env 5
-        - 71  # rls2009 nf-density iter env 5
-        - 72  # rls2009 nf-density iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 67  # rls2101.rel NDRPDR nf-density iter env 6
+        - 72  # rls2101.rel NDRPDR nf-density iter env 6
+        - 79  # rls2101.rel NDRPDR nf-density iter env 6
+        - 83  # rls2101.rel NDRPDR nf-density iter env 6
+        - 88  # rls2101.rel NDRPDR nf-density iter env 6
+        - 97  # rls2101.rel NDRPDR nf-density iter env 6
+        - 103 # rls2101.rel NDRPDR nf-density iter env 6
+        - 108 # rls2101.rel NDRPDR nf-density iter env 6
+        - 109 # rls2101.rel NDRPDR nf-density iter env 6
+        - 110 # rls2101.rel NDRPDR nf-density iter env 6
 
     plot-vpp-nfv-2n-skx-mrr:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 50  # rls2009 MRR nf-density iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 65  # rls2101.rel MRR nf-density iter env 6
 
     plot-vpp-nfv-reconf-2n-skx:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 27  # rls2009 reconf env 5
-        - 28  # rls2009 reconf env 5
-        - 29  # rls2009 reconf env 5
-        - 30  # rls2009 reconf env 5
-        - 31  # rls2009 reconf env 5
-        - 32  # rls2009 reconf env 5
-        - 61  # rls2009 reconf env 5
-        - 62  # rls2009 reconf env 5
-        - 68  # rls2009 reconf env 5
-        - 70  # rls2009 reconf env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 64  # rls2101.rel NDRPDR reconf iter env 6
+        - 66  # rls2101.rel NDRPDR reconf iter env 6
+        - 71  # rls2101.rel NDRPDR reconf iter env 6
+        - 74  # rls2101.rel NDRPDR reconf iter env 6
+        - 78  # rls2101.rel NDRPDR reconf iter env 6
+        - 87  # rls2101.rel NDRPDR reconf iter env 6
+        - 95  # rls2101.rel NDRPDR reconf iter env 6
+        - 100 # rls2101.rel NDRPDR reconf iter env 6
+        - 104 # rls2101.rel NDRPDR reconf iter env 6
+        - 106 # rls2101.rel NDRPDR reconf iter env 6
 
     plot-dpdk-throughput-latency-2n-skx:
-      csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 4   # NDRPDR iter env5
-        - 5   # NDRPDR iter env5
-        - 6   # NDRPDR iter env5
-        - 7   # NDRPDR iter env5
-        - 8   # NDRPDR iter env5
-        - 9   # NDRPDR iter env5
-        - 10  # NDRPDR iter env5
-        - 11  # NDRPDR iter env5
-        - 12  # NDRPDR iter env5
-        - 13  # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-skx:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 15  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
     plot-dpdk-hdrh-lat-2n-skx:
-      csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 4   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-skx:
+        - 11  # rls2101 NDRPDR iter env 6
 
     # 2n-zn2
 
     plot-vpp-throughput-lat-tsa-2n-zn2:
-      csit-vpp-perf-report-iterative-2009-2n-zn2:
-        - 3   # rls2009 NDRPDR iter env 5
-        - 4   # rls2009 NDRPDR iter env 5
-        - 6   # rls2009 NDRPDR iter env 5
-        - 7   # rls2009 NDRPDR iter env 5
-        - 8   # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 31  # rls2101.rel NDRPDR iter env 6
+        - 32  # rls2101.rel NDRPDR iter env 6
+        - 33  # rls2101.rel NDRPDR iter env 6
+        - 34  # rls2101.rel NDRPDR iter env 6
+        - 35  # rls2101.rel NDRPDR iter env 6
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 44  # rls2101.rel NDRPDR iter env 6
+        - 49  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter RND env 6
+        - 40  # rls2101.rel NDRPDR iter RND env 6
+        - 41  # rls2101.rel NDRPDR iter RND env 6
+        - 42  # rls2101.rel NDRPDR iter RND env 6
+        - 43  # rls2101.rel NDRPDR iter RND env 6
+        - 45  # rls2101.rel NDRPDR iter RND env 6
+        - 48  # rls2101.rel NDRPDR iter RND env 6
+        - 50  # rls2101.rel NDRPDR iter RND env 6
+        - 51  # rls2101.rel NDRPDR iter RND env 6
+        - 52  # rls2101.rel NDRPDR iter RND env 6
 
     plot-vpp-hdrh-lat-2n-zn2:
-      csit-vpp-perf-report-iterative-2009-2n-zn2:
-        - 3   # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 31  # rls2101.rel NDRPDR iter env 6
+
+    plot-vpp-hdrh-lat-2n-zn2-rnd:
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 40  # rls2101.rel NDRPDR iter RND env 6
 
     plot-dpdk-throughput-latency-2n-zn2:
-      csit-dpdk-perf-report-iterative-2009-2n-zn2:
-        - 1   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-zn2:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 16  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
     plot-dpdk-hdrh-lat-2n-zn2:
-      csit-dpdk-perf-report-iterative-2009-2n-zn2:
-        - 1   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-zn2:
+        - 11  # rls2101 NDRPDR iter env 6
 
     # 2n-clx
 
     plot-vpp-throughput-lat-tsa-2n-clx:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 36  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 65  # rls2009 NDRPDR iter env 5
-        - 66  # rls2009 NDRPDR iter env 5
-        - 79  # rls2009 NDRPDR iter env 5
-        - 82  # rls2009 NDRPDR iter env 5
-        - 88  # rls2009 NDRPDR iter env 5
-        - 89  # rls2009 NDRPDR iter env 5
-        - 90  # rls2009 NDRPDR iter env 5
-        - 114 # rls2009 NDRPDR iter NAT44 env 5
-        - 115 # rls2009 NDRPDR iter NAT44 env 5
-        - 116 # rls2009 NDRPDR iter NAT44 env 5
-        - 117 # rls2009 NDRPDR iter NAT44 env 5
-        - 118 # rls2009 NDRPDR iter NAT44 env 5
-        - 119 # rls2009 NDRPDR iter NAT44 env 5
-        - 121 # rls2009 NDRPDR iter NAT44 env 5
-        - 122 # rls2009 NDRPDR iter NAT44 env 5
-        - 123 # rls2009 NDRPDR iter NAT44 env 5
-        - 126 # rls2009 NDRPDR iter NAT44 env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 54  # rls2101.rel NDRPDR iter env 6
+        - 59  # rls2101.rel NDRPDR iter env 6
+        - 60  # rls2101.rel NDRPDR iter env 6
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 66  # rls2101.rel NDRPDR iter env 6
+        - 68  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 90  # rls2101.rel NDRPDR iter env 6
+        - 80  # rls2101.rel NDRPDR iter RND env 6
+        - 87  # rls2101.rel NDRPDR iter RND env 6
+        - 91  # rls2101.rel NDRPDR iter RND env 6
+        - 92  # rls2101.rel NDRPDR iter RND env 6
+        - 93  # rls2101.rel NDRPDR iter RND env 6
+        - 94  # rls2101.rel NDRPDR iter RND env 6
+        - 95  # rls2101.rel NDRPDR iter RND env 6
+        - 100 # rls2101.rel NDRPDR iter RND env 6
+        - 106 # rls2101.rel NDRPDR iter RND env 6
+        - 108 # rls2101.rel NDRPDR iter RND env 6
+        - 112 # rls2101.rel NDRPDR iter NAT env 6
+        - 113 # rls2101.rel NDRPDR iter NAT env 6
+        - 114 # rls2101.rel NDRPDR iter NAT env 6
+        - 115 # rls2101.rel NDRPDR iter NAT env 6
+        - 116 # rls2101.rel NDRPDR iter NAT env 6
+        - 117 # rls2101.rel NDRPDR iter NAT env 6
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
+        - 119 # rls2101.rel NDRPDR iter NAT env 6
+        - 120 # rls2101.rel NDRPDR iter NAT env 6
+        - 121 # rls2101.rel NDRPDR iter NAT env 6
 
     plot-vpp-hdrh-lat-2n-clx:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 36  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 75  # rls2101.rel NDRPDR iter env 6
 
-    plot-vpp-hdrh-lat-2n-clx-nat44:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 123 # rls2009 NDRPDR iter NAT44 env 5
+    plot-vpp-hdrh-lat-2n-clx-rnd:
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 87  # rls2101.rel NDRPDR iter RND env 6
+
+    plot-vpp-hdrh-lat-2n-clx-nat:
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
 
     plot-vpp-nfv-2n-clx-ndrpdr:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 37  # rls2009 nf-density iter env 5
-        - 43  # rls2009 nf-density iter env 5
-        - 69  # rls2009 nf-density iter env 5
-        - 70  # rls2009 nf-density iter env 5
-        - 71  # rls2009 nf-density iter env 5
-        - 72  # rls2009 nf-density iter env 5
-        - 73  # rls2009 nf-density iter env 5
-        - 74  # rls2009 nf-density iter env 5
-        - 75  # rls2009 nf-density iter env 5
-        - 76  # rls2009 nf-density iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 57  # rls2101.rel NDRPDR nf-density iter env 6
+        - 62  # rls2101.rel NDRPDR nf-density iter env 6
+        - 70  # rls2101.rel NDRPDR nf-density iter env 6
+        - 71  # rls2101.rel NDRPDR nf-density iter env 6
+        - 82  # rls2101.rel NDRPDR nf-density iter env 6
+        - 88  # rls2101.rel NDRPDR nf-density iter env 6
+        - 89  # rls2101.rel NDRPDR nf-density iter env 6
+        - 96  # rls2101.rel NDRPDR nf-density iter env 6
+        - 97  # rls2101.rel NDRPDR nf-density iter env 6
+        - 98  # rls2101.rel NDRPDR nf-density iter env 6
 
     plot-vpp-nfv-2n-clx-mrr:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 45  # rls2009 MRR nf-density iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 72  # rls2101.rel MRR nf-density iter env 6
 
     plot-vpp-nfv-reconf-2n-clx:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 25  # rls2009 reconf env 5
-        - 27  # rls2009 reconf env 5
-        - 28  # rls2009 reconf env 5
-        - 29  # rls2009 reconf env 5
-        - 30  # rls2009 reconf env 5
-        - 30  # rls2009 reconf env 5
-        - 32  # rls2009 reconf env 5
-        - 48  # rls2009 reconf env 5
-        - 53  # rls2009 reconf env 5
-        - 68  # rls2009 reconf env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 55  # rls2101.rel NDRPDR reconf iter env 6
+        - 64  # rls2101.rel NDRPDR reconf iter env 6
+        - 76  # rls2101.rel NDRPDR reconf iter env 6
+        - 83  # rls2101.rel NDRPDR reconf iter env 6
+        - 99  # rls2101.rel NDRPDR reconf iter env 6
+        - 101 # rls2101.rel NDRPDR reconf iter env 6
+        - 102 # rls2101.rel NDRPDR reconf iter env 6
+        - 107 # rls2101.rel NDRPDR reconf iter env 6
+        - 109 # rls2101.rel NDRPDR reconf iter env 6
+        - 110 # rls2101.rel NDRPDR reconf iter env 6
 
     plot-vpp-soak-2n-clx:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 33  # rls2009 soak env 5
-        - 34  # rls2009 soak env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 58  # rls2101.rel soak env 6
+        - 61  # rls2101.rel soak env 6
 
     plot-dpdk-throughput-latency-2n-clx:
-      csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 4   # NDRPDR iter env5
-        - 5   # NDRPDR iter env5
-        - 6   # NDRPDR iter env5
-        - 7   # NDRPDR iter env5
-        - 8   # NDRPDR iter env5
-        - 9   # NDRPDR iter env5
-        - 10  # NDRPDR iter env5
-        - 11  # NDRPDR iter env5
-        - 12  # NDRPDR iter env5
-        - 13  # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-clx:
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 22  # rls2101 NDRPDR iter env 6
 
     plot-dpdk-hdrh-lat-2n-clx:
-      csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 4   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-clx:
+        - 12  # rls2101 NDRPDR iter env 6
 
     # 3n-tsh
 
     plot-vpp-throughput-lat-tsa-3n-tsh:
-      csit-vpp-perf-report-iterative-2009-3n-tsh:
-        - 14  # rls2009 NDRPDR iter env 5
-        - 20  # rls2009 NDRPDR iter env 5
-        - 21  # rls2009 NDRPDR iter env 5
-        - 22  # rls2009 NDRPDR iter env 5
-        - 23  # rls2009 NDRPDR iter env 5
-        - 28  # rls2009 NDRPDR iter env 5
-        - 30  # rls2009 NDRPDR iter env 5
-        - 33  # rls2009 NDRPDR iter env 5
-        - 38  # rls2009 NDRPDR iter env 5
-        - 41  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-tsh:
+        - 23  # rls2101.rel NDRPDR iter env 6
+        - 24  # rls2101.rel NDRPDR iter env 6
+        - 25  # rls2101.rel NDRPDR iter env 6
+        - 26  # rls2101.rel NDRPDR iter env 6
+        - 27  # rls2101.rel NDRPDR iter env 6
+        - 28  # rls2101.rel NDRPDR iter env 6
+        - 29  # rls2101.rel NDRPDR iter env 6
+        - 30  # rls2101.rel NDRPDR iter env 6
+        - 31  # rls2101.rel NDRPDR iter env 6
+        - 32  # rls2101.rel NDRPDR iter env 6
 
     plot-vpp-hdrh-lat-3n-tsh:
-      csit-vpp-perf-report-iterative-2009-3n-tsh:
-        - 14  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-tsh:
+        - 23  # rls2101.rel NDRPDR iter env 6
 
     plot-dpdk-throughput-latency-3n-tsh:
-      csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1   # NDRPDR iter env5
-        - 2   # NDRPDR iter env5
-        - 3   # NDRPDR iter env5
-        - 4   # NDRPDR iter env5
-        - 5   # NDRPDR iter env5
-        - 6   # NDRPDR iter env5
-        - 7   # NDRPDR iter env5
-        - 9   # NDRPDR iter env5
-        - 10  # NDRPDR iter env5
-        - 11  # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-3n-tsh:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 16  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
     plot-dpdk-hdrh-lat-3n-tsh:
-      csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-3n-tsh:
+        - 21  # rls2101 NDRPDR iter env 6
+
+    # 2n-tx2
+
+    plot-vpp-throughput-lat-tsa-2n-tx2:
+      csit-vpp-perf-report-iterative-2101-2n-tx2:
+        - 22  # rls2101.rel NDRPDR iter env 6
+        - 23  # rls2101.rel NDRPDR iter env 6
+        - 24  # rls2101.rel NDRPDR iter env 6
+        - 25  # rls2101.rel NDRPDR iter env 6
+        - 26  # rls2101.rel NDRPDR iter env 6
+        - 27  # rls2101.rel NDRPDR iter env 6
+        - 28  # rls2101.rel NDRPDR iter env 6
+        - 29  # rls2101.rel NDRPDR iter env 6
+        - 30  # rls2101.rel NDRPDR iter env 6
+        - 31  # rls2101.rel NDRPDR iter env 6
+
+    plot-vpp-hdrh-lat-2n-tx2:
+      csit-vpp-perf-report-iterative-2101-2n-tx2:
+        - 29  # rls2101.rel NDRPDR iter env 6
+
+    plot-dpdk-throughput-latency-2n-tx2:
+      csit-dpdk-perf-report-iterative-2101-2n-tx2:
+        - 4   # rls2101 NDRPDR iter env 6
+        - 6   # rls2101 NDRPDR iter env 6
+        - 7   # rls2101 NDRPDR iter env 6
+        - 8   # rls2101 NDRPDR iter env 6
+        - 9   # rls2101 NDRPDR iter env 6
+        - 10  # rls2101 NDRPDR iter env 6
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+
+    plot-dpdk-hdrh-lat-2n-tx2:
+      csit-dpdk-perf-report-iterative-2101-2n-tx2:
+        - 4   # rls2101 NDRPDR iter env 6
 
     # 3n-dnv
 
     plot-vpp-throughput-lat-tsa-3n-dnv:
-      csit-vpp-perf-report-iterative-2009-3n-dnv:
-        - 3   # rls2009 NDRPDR iter env 5
-        - 6   # rls2009 NDRPDR iter env 5
-        - 7   # rls2009 NDRPDR iter env 5
-        - 8   # rls2009 NDRPDR iter env 5
-        - 10  # rls2009 NDRPDR iter env 5
-        - 11  # rls2009 NDRPDR iter env 5
-        - 12  # rls2009 NDRPDR iter env 5
-        - 14  # rls2009 NDRPDR iter env 5
-        - 15  # rls2009 NDRPDR iter env 5
-        - 24  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-dnv:
+        - 33  # rls2101.rel NDRPDR iter env 6
+        - 34  # rls2101.rel NDRPDR iter env 6
+        - 35  # rls2101.rel NDRPDR iter env 6
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 40  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 43  # rls2101.rel NDRPDR iter RND env 6
+        - 44  # rls2101.rel NDRPDR iter RND env 6
+        - 45  # rls2101.rel NDRPDR iter RND env 6
+        - 46  # rls2101.rel NDRPDR iter RND env 6
+        - 47  # rls2101.rel NDRPDR iter RND env 6
+        - 48  # rls2101.rel NDRPDR iter RND env 6
+        - 49  # rls2101.rel NDRPDR iter RND env 6
+        - 50  # rls2101.rel NDRPDR iter RND env 6
+        - 51  # rls2101.rel NDRPDR iter RND env 6
+        - 52  # rls2101.rel NDRPDR iter RND env 6
 
 #    plot-dpdk-throughput-latency-3n-dnv:
 #      # No data
     # 2n-dnv
 
     plot-vpp-throughput-lat-tsa-2n-dnv:
-      csit-vpp-perf-report-iterative-2009-2n-dnv:
-        - 3   # rls2009 NDRPDR iter env 5
-        - 5   # rls2009 NDRPDR iter env 5
-        - 6   # rls2009 NDRPDR iter env 5
-        - 7   # rls2009 NDRPDR iter env 5
-        - 9   # rls2009 NDRPDR iter env 5
-        - 10  # rls2009 NDRPDR iter env 5
-        - 11  # rls2009 NDRPDR iter env 5
-        - 12  # rls2009 NDRPDR iter env 5
-        - 14  # rls2009 NDRPDR iter env 5
-        - 15  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-dnv:
+        - 32  # rls2101.rel NDRPDR iter env 6
+        - 33  # rls2101.rel NDRPDR iter env 6
+        - 34  # rls2101.rel NDRPDR iter env 6
+        - 35  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 43  # rls2101.rel NDRPDR iter env 6
+        - 44  # rls2101.rel NDRPDR iter env 6
+        - 45  # rls2101.rel NDRPDR iter env 6
+        - 46  # rls2101.rel NDRPDR iter RND env 6
+        - 47  # rls2101.rel NDRPDR iter RND env 6
+        - 48  # rls2101.rel NDRPDR iter RND env 6
+        - 49  # rls2101.rel NDRPDR iter RND env 6
+        - 50  # rls2101.rel NDRPDR iter RND env 6
+        - 51  # rls2101.rel NDRPDR iter RND env 6
+        - 52  # rls2101.rel NDRPDR iter RND env 6
+        - 53  # rls2101.rel NDRPDR iter RND env 6
+        - 54  # rls2101.rel NDRPDR iter RND env 6
+        - 55  # rls2101.rel NDRPDR iter RND env 6
 
 #    plot-dpdk-throughput-latency-2n-dnv:
 #      # No data
     # NIC Comparisons
 
     vpp-nic-comparison-3n-skx:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 26  # rls2009 NDRPDR iter env 5
-        - 27  # rls2009 NDRPDR iter env 5
-        - 28  # rls2009 NDRPDR iter env 5
-        - 29  # rls2009 NDRPDR iter env 5
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 38  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 40  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 47  # rls2101.rel NDRPDR iter env 6
+        - 48  # rls2101.rel NDRPDR iter env 6
+        - 50  # rls2101.rel NDRPDR iter env 6
 
     vpp-nic-comparison-2n-skx:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 42  # rls2009 NDRPDR iter env 5
-        - 43  # rls2009 NDRPDR iter env 5
-        - 44  # rls2009 NDRPDR iter env 5
-        - 46  # rls2009 NDRPDR iter env 5
-        - 48  # rls2009 NDRPDR iter env 5
-        - 110 # rls2009 NDRPDR iter NAT44 env 5
-        - 111 # rls2009 NDRPDR iter NAT44 env 5
-        - 112 # rls2009 NDRPDR iter NAT44 env 5
-        - 113 # rls2009 NDRPDR iter NAT44 env 5
-        - 114 # rls2009 NDRPDR iter NAT44 env 5
-        - 115 # rls2009 NDRPDR iter NAT44 env 5
-        - 116 # rls2009 NDRPDR iter NAT44 env 5
-        - 118 # rls2009 NDRPDR iter NAT44 env 5
-        - 119 # rls2009 NDRPDR iter NAT44 env 5
-        - 121 # rls2009 NDRPDR iter NAT44 env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 69  # rls2101.rel NDRPDR iter env 6
+        - 70  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 76  # rls2101.rel NDRPDR iter env 6
+        - 77  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 85  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 94  # rls2101.rel NDRPDR iter env 6
+        - 89  # rls2101.rel NDRPDR iter RND env 6
+        - 90  # rls2101.rel NDRPDR iter RND env 6
+        - 91  # rls2101.rel NDRPDR iter RND env 6
+        - 92  # rls2101.rel NDRPDR iter RND env 6
+        - 93  # rls2101.rel NDRPDR iter RND env 6
+        - 96  # rls2101.rel NDRPDR iter RND env 6
+        - 98  # rls2101.rel NDRPDR iter RND env 6
+        - 99  # rls2101.rel NDRPDR iter RND env 6
+        - 101 # rls2101.rel NDRPDR iter RND env 6
+        - 102 # rls2101.rel NDRPDR iter RND env 6
+        - 116 # rls2101.rel NDRPDR iter NAT env 6
+        - 117 # rls2101.rel NDRPDR iter NAT env 6
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
+        - 119 # rls2101.rel NDRPDR iter NAT env 6
+        - 120 # rls2101.rel NDRPDR iter NAT env 6
+        - 121 # rls2101.rel NDRPDR iter NAT env 6
+        - 122 # rls2101.rel NDRPDR iter NAT env 6
+        - 123 # rls2101.rel NDRPDR iter NAT env 6
+        - 124 # rls2101.rel NDRPDR iter NAT env 6
+        - 125 # rls2101.rel NDRPDR iter NAT env 6
 
     vpp-nic-comparison-3n-skx-mrr:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 24  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 35  # rls2101.rel MRR iter env 6
 
     vpp-nic-comparison-2n-skx-mrr:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 120 # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 62  # rls2101.rel MRR iter env 6
 
     # Results
 
     vpp-perf-results-3n-hsw:
-      csit-vpp-perf-report-coverage-2009-3n-hsw:
-        - 3   # rls2009 NDRPDR cov 3n-hsw-crypto-00
-        - 4   # rls2009 NDRPDR cov 3n-hsw-crypto-01
-        - 5   # rls2009 NDRPDR cov 3n-hsw-crypto-02
-        - 6   # rls2009 NDRPDR cov 3n-hsw-crypto-03
-        - 7   # rls2009 NDRPDR cov 3n-hsw-ip4-00
-        - 8   # rls2009 NDRPDR cov 3n-hsw-ip4-01
-        - 9   # rls2009 NDRPDR cov 3n-hsw-ip4-02
-        - 10  # rls2009 NDRPDR cov 3n-hsw-ip4-03
-        - 11  # rls2009 NDRPDR cov 3n-hsw-ip4-04
-        - 12  # rls2009 NDRPDR cov 3n-hsw-ip4-05
-        - 13  # rls2009 NDRPDR cov 3n-hsw-ip4-06
-        - 14  # rls2009 NDRPDR cov 3n-hsw-ip4-07
-        - 15  # rls2009 NDRPDR cov 3n-hsw-ip4tun-00
-        - 16  # rls2009 NDRPDR cov 3n-hsw-ip4tun-01
-        - 17  # rls2009 NDRPDR cov 3n-hsw-ip4tun-02
-        - 18  # rls2009 NDRPDR cov 3n-hsw-ip6-00
-        - 19  # rls2009 NDRPDR cov 3n-hsw-ip6-01
-        - 20  # rls2009 NDRPDR cov 3n-hsw-ip6tun-00
-        - 21  # rls2009 NDRPDR cov 3n-hsw-l2-00
-        - 22  # rls2009 NDRPDR cov 3n-hsw-l2-01
-        - 23  # rls2009 NDRPDR cov 3n-hsw-l2-01
-        - 24  # rls2009 NDRPDR cov 3n-hsw-l2-03
-        - 25  # rls2009 NDRPDR cov 3n-hsw-l2-04
-        - 26  # rls2009 NDRPDR cov 3n-hsw-l2-05
-        - 27  # rls2009 NDRPDR cov 3n-hsw-l2-06
-        - 28  # rls2009 NDRPDR cov 3n-hsw-l2-07
-        - 29  # rls2009 NDRPDR cov 3n-hsw-l2-08
-        - 30  # rls2009 NDRPDR cov 3n-hsw-l2-09
-        - 31  # rls2009 NDRPDR cov 3n-hsw-l2-10
-        - 32  # rls2009 NDRPDR cov 3n-hsw-memif-00
-        - 33  # rls2009 NDRPDR cov 3n-hsw-srv6-00
-        - 34  # rls2009 NDRPDR cov 3n-hsw-srv6-01
-        - 35  # rls2009 NDRPDR cov 3n-hsw-vhost-00
-        - 36  # rls2009 NDRPDR cov 3n-hsw-vhost-01
-        - 37  # rls2009 NDRPDR cov 3n-hsw-vhost-02
+      csit-vpp-perf-report-coverage-2101-3n-hsw:
+        - 1   # rls2101.rel NDRPDR cov env 6 3n-hsw-crypto-00
+        - 2   # rls2101.rel NDRPDR cov env 6 3n-hsw-crypto-01
+        - 3   # rls2101.rel NDRPDR cov env 6 3n-hsw-crypto-02
+        - 4   # rls2101.rel NDRPDR cov env 6 3n-hsw-crypto-03
+        - 5   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-00
+        - 6   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-01
+        - 7   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-02
+        - 8   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-03
+        - 9   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-04
+        - 10  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-05
+        - 11  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-06
+        - 12  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-07
+        - 13  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4tun-00
+        - 14  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4tun-01
+        - 15  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4tun-02
+        - 16  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip6-00
+        - 18  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip6-01
+        - 19  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-00
+        - 20  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-01
+        - 21  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-02
+        - 22  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-03
+        - 23  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-04
+        - 24  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip6tun-00
+        - 25  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-05
+        - 26  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-06
+        - 27  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-07
+        - 28  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-08
+        - 29  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-09
+        - 30  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-10
+        - 31  # rls2101.rel NDRPDR cov env 6 3n-hsw-memif-00
+        - 32  # rls2101.rel NDRPDR cov env 6 3n-hsw-srv6-00
+        - 33  # rls2101.rel NDRPDR cov env 6 3n-hsw-srv6-01
+        - 34  # rls2101.rel NDRPDR cov env 6 3n-hsw-vhost-00
+        - 35  # rls2101.rel NDRPDR cov env 6 3n-hsw-vhost-01
+        - 36  # rls2101.rel NDRPDR cov env 6 3n-hsw-vhost-02
 
     vpp-perf-results-3n-skx:
-      csit-vpp-perf-report-coverage-2009-3n-skx:
-        - 36  # rls2009 NDRPDR cov 3n-skx-crypto-00
-        - 3   # rls2009 NDRPDR cov 3n-skx-crypto-01
-        - 4   # rls2009 NDRPDR cov 3n-skx-crypto-02
-        - 37  # rls2009 NDRPDR cov 3n-skx-crypto-03
-        - 6   # rls2009 NDRPDR cov 3n-skx-ip4-00
-        - 7   # rls2009 NDRPDR cov 3n-skx-ip4-01
-        - 8   # rls2009 NDRPDR cov 3n-skx-ip4-02
-        - 9   # rls2009 NDRPDR cov 3n-skx-ip4-03
-        - 10  # rls2009 NDRPDR cov 3n-skx-ip4-04
-        - 38  # rls2009 NDRPDR cov 3n-skx-ip4-05
-        - 12  # rls2009 NDRPDR cov 3n-skx-ip4-06
-        - 39  # rls2009 NDRPDR cov 3n-skx-ip4-07
-        - 14  # rls2009 NDRPDR cov 3n-skx-ip4tun-00
-        - 15  # rls2009 NDRPDR cov 3n-skx-ip4tun-01
-        - 16  # rls2009 NDRPDR cov 3n-skx-ip4tun-02
-        - 40  # rls2009 NDRPDR cov 3n-skx-ip6-00
-        - 18  # rls2009 NDRPDR cov 3n-skx-ip6-01
-        - 19  # rls2009 NDRPDR cov 3n-skx-ip6tun-00
-        - 20  # rls2009 NDRPDR cov 3n-skx-l2-00
-        - 21  # rls2009 NDRPDR cov 3n-skx-l2-01
-        - 22  # rls2009 NDRPDR cov 3n-skx-l2-02
-        - 23  # rls2009 NDRPDR cov 3n-skx-l2-03
-        - 24  # rls2009 NDRPDR cov 3n-skx-l2-04
-        - 41  # rls2009 NDRPDR cov 3n-skx-l2-05
-        - 42  # rls2009 NDRPDR cov 3n-skx-l2-06
-        - 43  # rls2009 NDRPDR cov 3n-skx-l2-07
-        - 28  # rls2009 NDRPDR cov 3n-skx-l2-08
-        - 44  # rls2009 NDRPDR cov 3n-skx-l2-09
-        - 45  # rls2009 NDRPDR cov 3n-skx-l2-10
-        - 46  # rls2009 NDRPDR cov 3n-skx-memif-00
-        - 47  # rls2009 NDRPDR cov 3n-skx-srv6-00
-        - 48  # rls2009 NDRPDR cov 3n-skx-srv6-01
-        - 49  # rls2009 NDRPDR cov 3n-skx-vhost-00
-        - 50  # rls2009 NDRPDR cov 3n-skx-vhost-01
-        - 51  # rls2009 NDRPDR cov 3n-skx-vhost-02
-        - 54  # rls2009 NDRPDR cov 3n-skx-vhost-03
+      csit-vpp-perf-report-coverage-2101-3n-skx:
+        - 1   # rls2101.rel NDRPDR cov env 6 3n-skx-crypto-00
+        - 2   # rls2101.rel NDRPDR cov env 6 3n-skx-crypto-01
+        - 3   # rls2101.rel NDRPDR cov env 6 3n-skx-crypto-02
+#         - 4   # rls2101.rel NDRPDR cov env 6 3n-skx-crypto-03
+        - 5   # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-00
+        - 16  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-01
+        - 7   # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-02
+#         - 17  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-03
+        - 18  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-04
+#         - 19  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-05
+        - 20  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-06
+        - 12  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-06
+        - 13  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4tun-00
+        - 26  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4tun-01
+        - 15  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4tun-02
+        - 21  # rls2101.rel NDRPDR cov env 6 3n-skx-ip6-00
+        - 22  # rls2101.rel NDRPDR cov env 6 3n-skx-ip6-01
+        - 23  # rls2101.rel NDRPDR cov env 6 3n-skx-ip6tun-00
+        - 24  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-00
+        - 30  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-01
+        - 27  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-02
+        - 28  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-03
+        - 29  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-04
+#         - 31  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-05
+        - 32  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-06
+        - 33  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-07
+        - 34  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-08
+        - 35  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-09
+        - 36  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-10
+        - 37  # rls2101.rel NDRPDR cov env 6 3n-skx-memif-00
+        - 38  # rls2101.rel NDRPDR cov env 6 3n-skx-srv6-00
+        - 39  # rls2101.rel NDRPDR cov env 6 3n-skx-srv6-01
+#         - 40  # rls2101.rel NDRPDR cov env 6 3n-skx-vhost-00
+#         - 41  # rls2101.rel NDRPDR cov env 6 3n-skx-vhost-01
+        - 42  # rls2101.rel NDRPDR cov env 6 3n-skx-vhost-02
+        - 43  # rls2101.rel NDRPDR cov env 6 3n-skx-vhost-03
 
     vpp-perf-results-2n-skx:
-      csit-vpp-perf-report-coverage-2009-2n-skx:
-        - 18  # rls2009 NDRPDR cov 2n-skx-ip4-00
-        - 19  # rls2009 NDRPDR cov 2n-skx-ip4-01
-        - 10  # rls2009 NDRPDR cov 2n-skx-ip4-02
-        - 20  # rls2009 NDRPDR cov 2n-skx-ip4-03
-        - 21  # rls2009 NDRPDR cov 2n-skx-ip4-04
-        - 31  # rls2009 NDRPDR cov 2n-skx-ip4-05
-        - 32  # rls2009 NDRPDR cov 2n-skx-ip4-06
-        - 33  # rls2009 NDRPDR cov 2n-skx-ip4-07
-        - 22  # rls2009 NDRPDR cov 2n-skx-ip6-00
-        - 23  # rls2009 NDRPDR cov 2n-skx-ip6-01
-        - 24  # rls2009 NDRPDR cov 2n-skx-l2-00
-        - 25  # rls2009 NDRPDR cov 2n-skx-l2-01
-        - 26  # rls2009 NDRPDR cov 2n-skx-lb-00
-        - 27  # rls2009 NDRPDR cov 2n-skx-memif-00
-        - 28  # rls2009 NDRPDR cov 2n-skx-vhost-00
-        - 29  # rls2009 NDRPDR cov 2n-skx-vhost-01
-        - 30  # rls2009 NDRPDR cov 2n-skx-vts-00
+      csit-vpp-perf-report-coverage-2101-2n-skx:
+        - 1   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-00
+        - 2   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-01
+        - 3   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-02
+        - 4   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-03
+        - 5   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-04
+        - 6   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-05
+        - 7   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-06
+        - 8   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-07
+        - 21  # rls2101.rel NDRPDR cov env 6 2n-skx-ip4tun-00
+        - 22  # rls2101.rel NDRPDR cov env 6 2n-skx-ip4tun-00
+        - 10  # rls2101.rel NDRPDR cov env 6 2n-skx-ip6-00
+        - 11  # rls2101.rel NDRPDR cov env 6 2n-skx-ip6-01
+        - 12  # rls2101.rel NDRPDR cov env 6 2n-skx-l2-00
+        - 13  # rls2101.rel NDRPDR cov env 6 2n-skx-l2-01
+        - 14  # rls2101.rel NDRPDR cov env 6 2n-skx-lb-00
+        - 15  # rls2101.rel NDRPDR cov env 6 2n-skx-memif-00
+        - 16  # rls2101.rel NDRPDR cov env 6 2n-skx-vhost-00
+        - 17  # rls2101.rel NDRPDR cov env 6 2n-skx-vhost-01
+        - 19  # rls2101.rel NDRPDR cov env 6 2n-skx-vts-00
 
     vpp-perf-results-2n-zn2:
-      csit-vpp-perf-report-iterative-2009-2n-zn2:
-        - 3   # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 31  # rls2101.rel NDRPDR iter env 6
 
     vpp-perf-results-2n-clx:
-      csit-vpp-perf-report-coverage-2009-2n-clx:
-        - 2   # rls2009 NDRPDR cov 2n-clx-ip4-00
-        - 3   # rls2009 NDRPDR cov 2n-clx-ip4-01
-        - 4   # rls2009 NDRPDR cov 2n-clx-ip4-02
-        - 5   # rls2009 NDRPDR cov 2n-clx-ip4-03
-        - 6   # rls2009 NDRPDR cov 2n-clx-ip4-04
-        - 23  # rls2009 NDRPDR cov 2n-clx-ip4-05
-        - 24  # rls2009 NDRPDR cov 2n-clx-ip4-06
-        - 25  # rls2009 NDRPDR cov 2n-clx-ip4-07
-        - 22  # rls2009 NDRPDR cov 2n-clx-ip6-00
-        - 9   # rls2009 NDRPDR cov 2n-clx-ip6-01
-        - 17  # rls2009 NDRPDR cov 2n-clx-l2-00
-        - 21  # rls2009 NDRPDR cov 2n-clx-l2-01
-        - 12  # rls2009 NDRPDR cov 2n-clx-lb-00
-        - 13  # rls2009 NDRPDR cov 2n-clx-memif-00
-        - 14  # rls2009 NDRPDR cov 2n-clx-vhost-00
-        - 15  # rls2009 NDRPDR cov 2n-clx-vhost-01
-        - 16  # rls2009 NDRPDR cov 2n-clx-vts-00
+      csit-vpp-perf-report-coverage-2101-2n-clx:
+        - 1   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-00
+        - 2   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-01
+        - 3   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-02
+        - 4   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-03
+        - 5   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-04
+        - 6   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-05
+        - 7   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-06
+        - 8   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-07
+        - 19  # rls2101.rel NDRPDR cov env 6 2n-clx-ip4tun-00
+        - 20  # rls2101.rel NDRPDR cov env 6 2n-clx-ip4tun-00
+        - 10  # rls2101.rel NDRPDR cov env 6 2n-clx-ip6-00
+        - 11  # rls2101.rel NDRPDR cov env 6 2n-clx-ip6-01
+        - 12  # rls2101.rel NDRPDR cov env 6 2n-clx-l2-00
+        - 13  # rls2101.rel NDRPDR cov env 6 2n-clx-l2-01
+        - 14  # rls2101.rel NDRPDR cov env 6 2n-clx-lb-00
+        - 15  # rls2101.rel NDRPDR cov env 6 2n-clx-memif-00
+        - 16  # rls2101.rel NDRPDR cov env 6 2n-clx-vhost-00
+        - 17  # rls2101.rel NDRPDR cov env 6 2n-clx-vhost-01
+        - 18  # rls2101.rel NDRPDR cov env 6 2n-clx-vts-00
 
     vpp-perf-results-3n-tsh:
-      csit-vpp-perf-report-iterative-2009-3n-tsh:
-        - 14  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-tsh:
+        - 23  # rls2101.rel NDRPDR iter env 6
+
+    vpp-perf-results-2n-tx2:
+      csit-vpp-perf-report-coverage-2101-2n-tx2:
+        - 1   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-00
+        - 2   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-01
+        - 3   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-02
+        - 4   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-03
+        - 5   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-04
+        - 6   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-05
+        - 7   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-06
+        - 8   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip6-00
+        - 9   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip6-01
+        - 10  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-00
+        - 11  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-01
+        - 12  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-02
+        - 13  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-03
+        - 15  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-04
 
     vpp-perf-results-3n-dnv:
-      csit-vpp-perf-report-coverage-2009-3n-dnv:
-        - 10  # rls2009 NDRPDR cov 3n-dnv-crypto-00
-        - 2   # rls2009 NDRPDR cov 3n-dnv-crypto-01
-        - 11  # rls2009 NDRPDR cov 3n-dnv-ip4-00
-        - 12  # rls2009 NDRPDR cov 3n-dnv-ip4-01
-        - 13  # rls2009 NDRPDR cov 3n-dnv-ip4tun-00
-        - 14  # rls2009 NDRPDR cov 3n-dnv-ip6-00
-        - 15  # rls2009 NDRPDR cov 3n-dnv-ip6-01
-        - 16  # rls2009 NDRPDR cov 3n-dnv-l2-00
-        - 17  # rls2009 NDRPDR cov 3n-dnv-l2-01
+      csit-vpp-perf-report-coverage-2101-3n-dnv:
+        - 1   # rls2101.rel NDRPDR cov env 6 3n-dnv-crypto-00
+        - 2   # rls2101.rel NDRPDR cov env 6 3n-dnv-crypto-01
+        - 3   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4-00
+        - 4   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4-01
+        - 5   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4tun-00
+        - 6   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip6-00
+        - 7   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip6-01
+        - 8   # rls2101.rel NDRPDR cov env 6 3n-dnv-l2-00
+        - 9   # rls2101.rel NDRPDR cov env 6 3n-dnv-l2-01
 
     vpp-perf-results-2n-dnv:
-      csit-vpp-perf-report-coverage-2009-2n-dnv:
-        - 2   # rls2009 NDRPDR cov 2n-dnv-ip4-00
-        - 3   # rls2009 NDRPDR cov 2n-dnv-ip4-01
-        - 4   # rls2009 NDRPDR cov 2n-dnv-ip6-00
-        - 5   # rls2009 NDRPDR cov 2n-dnv-ip6-01
-        - 6   # rls2009 NDRPDR cov 2n-dnv-l2-00
-        - 7   # rls2009 NDRPDR cov 2n-dnv-l2-01
+      csit-vpp-perf-report-coverage-2101-2n-dnv:
+        - 1   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4-00
+        - 2   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4-01
+        - 3   # rls2101.rel NDRPDR cov env 6 2n-dnv-ip6-00
+        - 4   # rls2101.rel NDRPDR cov env 6 2n-dnv-ip6-01
+        - 5   # rls2101.rel NDRPDR cov env 6 2n-dnv-l2-00
+        - 6   # rls2101.rel NDRPDR cov env 6 2n-dnv-l2-01
 
     vpp-mrr-results-3n-hsw:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 23  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 63  # rls2101.rel MRR iter env 6
 
     vpp-mrr-results-3n-skx:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 24  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 35  # rls2101.rel MRR iter env 6
 
     vpp-mrr-results-2n-skx:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 120 # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 62  # rls2101.rel MRR iter env 6
 
     vpp-mrr-results-2n-zn2:
-      csit-vpp-perf-report-iterative-2009-2n-zn2:
-        - 1   # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 30  # rls2101.rel MRR iter env 6
 
     vpp-mrr-results-2n-clx:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 125 # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 53  # rls2101.rel MRR iter env 6
 
     vpp-mrr-results-3n-tsh:
-      csit-vpp-perf-report-iterative-2009-3n-tsh:
-        - 15  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-tsh:
+        - 22  # rls2101.rel MRR iter env 6
+
+    vpp-mrr-results-2n-tx2:
+      csit-vpp-perf-report-iterative-2101-2n-tx2:
+        - 21  # rls2101.rel MRR iter env 6
 
     vpp-mrr-results-3n-dnv:
-      csit-vpp-perf-report-iterative-2009-3n-dnv:
-        - 22  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-dnv:
+        - 32  # rls2101.rel MRR iter env 6
 
     vpp-mrr-results-2n-dnv:
-      csit-vpp-perf-report-iterative-2009-2n-dnv:
-        - 13  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-dnv:
+        - 31  # rls2101.rel MRR iter env 6
 
     vpp-device-results-ubuntu:
-      csit-vpp-device-2009-ubuntu1804-1n-skx:
-        - 131 # rls2009 env 5
+      csit-vpp-device-2101-ubuntu1804-1n-skx:
+        - 358  # rls2101.rel VPP DEV env 6
 
     dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 6   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-3n-hsw:
+        - 11  # rls2101 NDRPDR iter env 6
 
     dpdk-perf-results-3n-skx:
-      csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 4   # NDRPDR sel env5
+      csit-dpdk-perf-report-iterative-2101-3n-skx:
+        - 12  # rls2101 NDRPDR iter env 6
 
     dpdk-perf-results-2n-skx:
-      csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 4   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-skx:
+        - 11  # rls2101 NDRPDR iter env 6
 
     dpdk-perf-results-2n-zn2:
-      csit-dpdk-perf-report-iterative-2009-2n-zn2:
-        - 1   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-zn2:
+        - 11  # rls2101 NDRPDR iter env 6
 
     dpdk-perf-results-2n-clx:
-      csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 4   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-clx:
+        - 12  # rls2101 NDRPDR iter env 6
 
 #    dpdk-perf-results-2n-dnv:
 #      # No data
 #      csit-dpdk-perf-report-iterative-2009-3n-dnv:
 
     dpdk-perf-results-3n-tsh:
-      csit-dpdk-perf-report-iterative-2009-3n-tsh:
-        - 1   # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-3n-tsh:
+        - 21  # rls2101 NDRPDR iter env 6
+
+    dpdk-perf-results-2n-tx2:
+      csit-dpdk-perf-report-iterative-2101-2n-tx2:
+        - 4   # rls2101 NDRPDR iter env 6
 
 ###########################################################################
     # Tables (more than one data set)
     # Performance changes
 
     vpp-performance-changes-3n-hsw-h1:
-      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
-    vpp-performance-changes-3n-hsw-ref-env4:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 20  # NDRPDR sel env 4
-        - 21  # NDRPDR sel env 4
-        - 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-hsw-ref-env5:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
         - 9   # rls2005 NDRPDR iter env 5
         - 10  # rls2005 NDRPDR iter env 5
         - 16  # rls2005 NDRPDR iter env 5
         - 17  # rls2005 NDRPDR iter env 5
         - 19  # rls2005 NDRPDR iter env 5
-    vpp-performance-changes-3n-hsw-cmp:
+    vpp-performance-changes-3n-hsw-ref-env-old:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
         - 21  # rls2009 NDRPDR iter env 5
         - 22  # rls2009 NDRPDR iter env 5
         - 29  # rls2009 NDRPDR iter env 5
         - 30  # rls2009 NDRPDR iter env 5
         - 31  # rls2009 NDRPDR iter env 5
+    vpp-performance-changes-3n-hsw-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 19  # rls2009 NDRPDR iter env 6
+        - 20  # rls2009 NDRPDR iter env 6
+        - 21  # rls2009 NDRPDR iter env 6
+        - 22  # rls2009 NDRPDR iter env 6
+        - 23  # rls2009 NDRPDR iter env 6
+        - 24  # rls2009 NDRPDR iter env 6
+        - 25  # rls2009 NDRPDR iter env 6
+        - 26  # rls2009 NDRPDR iter env 6
+        - 27  # rls2009 NDRPDR iter env 6
+        - 28  # rls2009 NDRPDR iter env 6
+    vpp-performance-changes-3n-hsw-cmp:
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 64  # rls2101.rel NDRPDR iter env 6
+        - 71  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 74  # rls2101.rel NDRPDR iter env 6
+        - 80  # rls2101.rel NDRPDR iter env 6
+        - 81  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 83  # rls2101.rel NDRPDR iter env 6
+        - 88  # rls2101.rel NDRPDR iter env 6
+        - 89  # rls2101.rel NDRPDR iter env 6
+        - 128 # rls2101.rel NDRPDR iter RND env 6
+        - 129 # rls2101.rel NDRPDR iter RND env 6
+        - 130 # rls2101.rel NDRPDR iter RND env 6
+        - 131 # rls2101.rel NDRPDR iter RND env 6
+        - 132 # rls2101.rel NDRPDR iter RND env 6
+        - 133 # rls2101.rel NDRPDR iter RND env 6
+        - 134 # rls2101.rel NDRPDR iter RND env 6
+        - 135 # rls2101.rel NDRPDR iter RND env 6
+        - 136 # rls2101.rel NDRPDR iter RND env 6
+        - 137 # rls2101.rel NDRPDR iter RND env 6
 
     vpp-performance-changes-3n-skx-h1:
-      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
-    vpp-performance-changes-3n-skx-ref-env4:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 42  # NDRPDR sel env 4
-        - 43  # NDRPDR sel env 4
-        - 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-3n-skx-ref-env5:
       csit-vpp-perf-report-iterative-2009-3n-skx:
         - 13  # rls2005 NDRPDR iter env 5
         - 18  # rls2005 NDRPDR iter env 5
         - 46  # rls2005 NDRPDR iter env 5
         - 48  # rls2005 NDRPDR iter env 5
         - 49  # rls2005 NDRPDR iter env 5
-    vpp-performance-changes-3n-skx-cmp:
+    vpp-performance-changes-3n-skx-ref-env-old:
       csit-vpp-perf-report-iterative-2009-3n-skx:
         - 26  # rls2009 NDRPDR iter env 5
         - 27  # rls2009 NDRPDR iter env 5
         - 38  # rls2009 NDRPDR iter env 5
         - 39  # rls2009 NDRPDR iter env 5
         - 40  # rls2009 NDRPDR iter env 5
+    vpp-performance-changes-3n-skx-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 14  # rls2009 NDRPDR iter env 6
+        - 15  # rls2009 NDRPDR iter env 6
+        - 16  # rls2009 NDRPDR iter env 6
+        - 17  # rls2009 NDRPDR iter env 6
+        - 18  # rls2009 NDRPDR iter env 6
+        - 25  # rls2009 NDRPDR iter env 6
+        - 26  # rls2009 NDRPDR iter env 6
+        - 27  # rls2009 NDRPDR iter env 6
+        - 29  # rls2009 NDRPDR iter env 6
+        - 31  # rls2009 NDRPDR iter env 6
+    vpp-performance-changes-3n-skx-cmp:
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 40  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 47  # rls2101.rel NDRPDR iter env 6
+        - 48  # rls2101.rel NDRPDR iter env 6
+        - 50  # rls2101.rel NDRPDR iter env 6
 
     vpp-performance-changes-2n-skx-h1:
-      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-2n-skx-ref-env4:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 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-skx-ref-env5:
       csit-vpp-perf-report-iterative-2009-2n-skx:
         - 13  # rls2005 NDRPDR iter env 5
         - 16  # rls2005 NDRPDR iter env 5
         - 23  # rls2005 NDRPDR iter env 5
         - 24  # rls2005 NDRPDR iter env 5
         - 25  # rls2005 NDRPDR iter env 5
-    vpp-performance-changes-2n-skx-cmp:
+    vpp-performance-changes-2n-skx-ref-env-old:
       csit-vpp-perf-report-iterative-2009-2n-skx:
         - 35  # rls2009 NDRPDR iter env 5
         - 36  # rls2009 NDRPDR iter env 5
         - 118 # rls2009 NDRPDR iter NAT44 env 5
         - 119 # rls2009 NDRPDR iter NAT44 env 5
         - 121 # rls2009 NDRPDR iter NAT44 env 5
+    vpp-performance-changes-2n-skx-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 22  # rls2009 NDRPDR iter env 6
+        - 23  # rls2009 NDRPDR iter env 6
+        - 24  # rls2009 NDRPDR iter env 6
+        - 25  # rls2009 NDRPDR iter env 6
+        - 26  # rls2009 NDRPDR iter env 6
+        - 28  # rls2009 NDRPDR iter env 6
+        - 39  # rls2009 NDRPDR iter env 6
+        - 40  # rls2009 NDRPDR iter env 6
+        - 41  # rls2009 NDRPDR iter env 6
+        - 44  # rls2009 NDRPDR iter env 6
+    vpp-performance-changes-2n-skx-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 69  # rls2101.rel NDRPDR iter env 6
+        - 70  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 76  # rls2101.rel NDRPDR iter env 6
+        - 77  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 85  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 94  # rls2101.rel NDRPDR iter env 6
+        - 89  # rls2101.rel NDRPDR iter RND env 6
+        - 90  # rls2101.rel NDRPDR iter RND env 6
+        - 91  # rls2101.rel NDRPDR iter RND env 6
+        - 92  # rls2101.rel NDRPDR iter RND env 6
+        - 93  # rls2101.rel NDRPDR iter RND env 6
+        - 96  # rls2101.rel NDRPDR iter RND env 6
+        - 98  # rls2101.rel NDRPDR iter RND env 6
+        - 99  # rls2101.rel NDRPDR iter RND env 6
+        - 101 # rls2101.rel NDRPDR iter RND env 6
+        - 102 # rls2101.rel NDRPDR iter RND env 6
+        - 116 # rls2101.rel NDRPDR iter NAT env 6
+        - 117 # rls2101.rel NDRPDR iter NAT env 6
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
+        - 119 # rls2101.rel NDRPDR iter NAT env 6
+        - 120 # rls2101.rel NDRPDR iter NAT env 6
+        - 121 # rls2101.rel NDRPDR iter NAT env 6
+        - 122 # rls2101.rel NDRPDR iter NAT env 6
+        - 123 # rls2101.rel NDRPDR iter NAT env 6
+        - 124 # rls2101.rel NDRPDR iter NAT env 6
+        - 125 # rls2101.rel NDRPDR iter NAT env 6
 
     vpp-performance-changes-2n-clx-h1:
-      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
-    vpp-performance-changes-2n-clx-ref-env4:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 62  # NDRPDR sel env 4
-        - 63  # NDRPDR sel env 4
-        - 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-clx-ref-env5:
       csit-vpp-perf-report-iterative-2009-2n-clx:
         - 13  # rls2005 NDRPDR iter env 5
         - 15  # rls2005 NDRPDR iter env 5
         - 22  # rls2005 NDRPDR iter env 5
         - 23  # rls2005 NDRPDR iter env 5
         - 24  # rls2005 NDRPDR iter env 5
-    vpp-performance-changes-2n-clx-cmp:
+    vpp-performance-changes-2n-clx-ref-env-old:
       csit-vpp-perf-report-iterative-2009-2n-clx:
         - 36  # rls2009 NDRPDR iter env 5
         - 39  # rls2009 NDRPDR iter env 5
         - 122 # rls2009 NDRPDR iter NAT44 env 5
         - 123 # rls2009 NDRPDR iter NAT44 env 5
         - 126 # rls2009 NDRPDR iter NAT44 env 5
+    vpp-performance-changes-2n-clx-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 16  # rls2009 NDRPDR iter env 6
+        - 17  # rls2009 NDRPDR iter env 6
+        - 18  # rls2009 NDRPDR iter env 6
+        - 19  # rls2009 NDRPDR iter env 6
+        - 20  # rls2009 NDRPDR iter env 6
+        - 21  # rls2009 NDRPDR iter env 6
+        - 32  # rls2009 NDRPDR iter env 6
+        - 33  # rls2009 NDRPDR iter env 6
+        - 34  # rls2009 NDRPDR iter env 6
+        - 35  # rls2009 NDRPDR iter env 6
+    vpp-performance-changes-2n-clx-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 54  # rls2101.rel NDRPDR iter env 6
+        - 59  # rls2101.rel NDRPDR iter env 6
+        - 60  # rls2101.rel NDRPDR iter env 6
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 66  # rls2101.rel NDRPDR iter env 6
+        - 68  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 90  # rls2101.rel NDRPDR iter env 6
+        - 80  # rls2101.rel NDRPDR iter RND env 6
+        - 87  # rls2101.rel NDRPDR iter RND env 6
+        - 91  # rls2101.rel NDRPDR iter RND env 6
+        - 92  # rls2101.rel NDRPDR iter RND env 6
+        - 93  # rls2101.rel NDRPDR iter RND env 6
+        - 94  # rls2101.rel NDRPDR iter RND env 6
+        - 95  # rls2101.rel NDRPDR iter RND env 6
+        - 100 # rls2101.rel NDRPDR iter RND env 6
+        - 106 # rls2101.rel NDRPDR iter RND env 6
+        - 108 # rls2101.rel NDRPDR iter RND env 6
+        - 112 # rls2101.rel NDRPDR iter NAT env 6
+        - 113 # rls2101.rel NDRPDR iter NAT env 6
+        - 114 # rls2101.rel NDRPDR iter NAT env 6
+        - 115 # rls2101.rel NDRPDR iter NAT env 6
+        - 116 # rls2101.rel NDRPDR iter NAT env 6
+        - 117 # rls2101.rel NDRPDR iter NAT env 6
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
+        - 119 # rls2101.rel NDRPDR iter NAT env 6
+        - 120 # rls2101.rel NDRPDR iter NAT env 6
+        - 121 # rls2101.rel NDRPDR iter NAT env 6
+
+    vpp-performance-changes-2n-zn2-ref-env-old:
+      csit-vpp-perf-report-iterative-2009-2n-zn2:
+        - 17  # rls2009 NDRPDR iter env 5
+        - 18  # rls2009 NDRPDR iter env 5
+        - 31  # rls2009 NDRPDR iter env 5
+        - 33  # rls2009 NDRPDR iter env 5
+        - 34  # rls2009 NDRPDR iter env 5
+    vpp-performance-changes-2n-zn2-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 9   # rls2009 NDRPDR iter env 6
+        - 10  # rls2009 NDRPDR iter env 6
+        - 11  # rls2009 NDRPDR iter env 6
+        - 12  # rls2009 NDRPDR iter env 6
+        - 13  # rls2009 NDRPDR iter env 6
+        - 20  # rls2009 NDRPDR iter env 6
+        - 21  # rls2009 NDRPDR iter env 6
+        - 22  # rls2009 NDRPDR iter env 6
+        - 25  # rls2009 NDRPDR iter env 6
+        - 26  # rls2009 NDRPDR iter env 6
+    vpp-performance-changes-2n-zn2-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 31  # rls2101.rel NDRPDR iter env 6
+        - 32  # rls2101.rel NDRPDR iter env 6
+        - 33  # rls2101.rel NDRPDR iter env 6
+        - 34  # rls2101.rel NDRPDR iter env 6
+        - 35  # rls2101.rel NDRPDR iter env 6
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 44  # rls2101.rel NDRPDR iter env 6
+        - 49  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter RND env 6
+        - 40  # rls2101.rel NDRPDR iter RND env 6
+        - 41  # rls2101.rel NDRPDR iter RND env 6
+        - 42  # rls2101.rel NDRPDR iter RND env 6
+        - 43  # rls2101.rel NDRPDR iter RND env 6
+        - 45  # rls2101.rel NDRPDR iter RND env 6
+        - 48  # rls2101.rel NDRPDR iter RND env 6
+        - 50  # rls2101.rel NDRPDR iter RND env 6
+        - 51  # rls2101.rel NDRPDR iter RND env 6
+        - 52  # rls2101.rel NDRPDR iter RND env 6
 
     vpp-performance-changes-2n-dnv-h1:
-      csit-vpp-perf-verify-2001-2n-dnv:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 16  # NDRPDR sel
-    vpp-performance-changes-2n-dnv-ref:
       csit-vpp-perf-report-iterative-2009-2n-dnv:
         - 16  # rls2005 NDRPDR iter env 5
         - 17  # rls2005 NDRPDR iter env 5
         - 28  # rls2005 NDRPDR iter env 5
         - 29  # rls2005 NDRPDR iter env 5
         - 30  # rls2005 NDRPDR iter env 5
-    vpp-performance-changes-2n-dnv-cmp:
+    vpp-performance-changes-2n-dnv-ref-env-old:
       csit-vpp-perf-report-iterative-2009-2n-dnv:
         - 3   # rls2009 NDRPDR iter env 5
         - 5   # rls2009 NDRPDR iter env 5
         - 12  # rls2009 NDRPDR iter env 5
         - 14  # rls2009 NDRPDR iter env 5
         - 15  # rls2009 NDRPDR iter env 5
+    vpp-performance-changes-2n-dnv-ref-env-new:
+      # TODO: Re-test in new env
+      csit-vpp-perf-report-iterative-2009-2n-dnv:
+        - 3   # rls2009 NDRPDR iter env 5
+        - 5   # rls2009 NDRPDR iter env 5
+        - 6   # rls2009 NDRPDR iter env 5
+        - 7   # rls2009 NDRPDR iter env 5
+        - 9   # rls2009 NDRPDR iter env 5
+        - 10  # rls2009 NDRPDR iter env 5
+        - 11  # rls2009 NDRPDR iter env 5
+        - 12  # rls2009 NDRPDR iter env 5
+        - 14  # rls2009 NDRPDR iter env 5
+        - 15  # rls2009 NDRPDR iter env 5
+    vpp-performance-changes-2n-dnv-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-dnv:
+        - 32  # rls2101.rel NDRPDR iter env 6
+        - 33  # rls2101.rel NDRPDR iter env 6
+        - 34  # rls2101.rel NDRPDR iter env 6
+        - 35  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 43  # rls2101.rel NDRPDR iter env 6
+        - 44  # rls2101.rel NDRPDR iter env 6
+        - 45  # rls2101.rel NDRPDR iter env 6
+        - 46  # rls2101.rel NDRPDR iter RND env 6
+        - 47  # rls2101.rel NDRPDR iter RND env 6
+        - 48  # rls2101.rel NDRPDR iter RND env 6
+        - 49  # rls2101.rel NDRPDR iter RND env 6
+        - 50  # rls2101.rel NDRPDR iter RND env 6
+        - 51  # rls2101.rel NDRPDR iter RND env 6
+        - 52  # rls2101.rel NDRPDR iter RND env 6
+        - 53  # rls2101.rel NDRPDR iter RND env 6
+        - 54  # rls2101.rel NDRPDR iter RND env 6
+        - 55  # rls2101.rel NDRPDR iter RND env 6
 
     vpp-performance-changes-3n-dnv-h1:
-      csit-vpp-perf-verify-2001-3n-dnv:
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-    vpp-performance-changes-3n-dnv-ref:
       csit-vpp-perf-report-iterative-2009-3n-dnv:
         - 16  # rls2005 NDRPDR iter env 5
         - 23  # rls2005 NDRPDR iter env 5
         - 30  # rls2005 NDRPDR iter env 5
         - 31  # rls2005 NDRPDR iter env 5
         - 32  # rls2005 NDRPDR iter env 5
-    vpp-performance-changes-3n-dnv-cmp:
+    vpp-performance-changes-3n-dnv-ref-env-old:
+      csit-vpp-perf-report-iterative-2009-3n-dnv:
+        - 3   # rls2009 NDRPDR iter env 5
+        - 6   # rls2009 NDRPDR iter env 5
+        - 7   # rls2009 NDRPDR iter env 5
+        - 8   # rls2009 NDRPDR iter env 5
+        - 10  # rls2009 NDRPDR iter env 5
+        - 11  # rls2009 NDRPDR iter env 5
+        - 12  # rls2009 NDRPDR iter env 5
+        - 14  # rls2009 NDRPDR iter env 5
+        - 15  # rls2009 NDRPDR iter env 5
+        - 24  # rls2009 NDRPDR iter env 5
+    vpp-performance-changes-3n-dnv-ref-env-new:
+      # TODO: Re-test in new env
       csit-vpp-perf-report-iterative-2009-3n-dnv:
         - 3   # rls2009 NDRPDR iter env 5
         - 6   # rls2009 NDRPDR iter env 5
         - 14  # rls2009 NDRPDR iter env 5
         - 15  # rls2009 NDRPDR iter env 5
         - 24  # rls2009 NDRPDR iter env 5
+    vpp-performance-changes-3n-dnv-cmp:
+      csit-vpp-perf-report-iterative-2101-3n-dnv:
+        - 33  # rls2101.rel NDRPDR iter env 6
+        - 34  # rls2101.rel NDRPDR iter env 6
+        - 35  # rls2101.rel NDRPDR iter env 6
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 40  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 43  # rls2101.rel NDRPDR iter RND env 6
+        - 44  # rls2101.rel NDRPDR iter RND env 6
+        - 45  # rls2101.rel NDRPDR iter RND env 6
+        - 46  # rls2101.rel NDRPDR iter RND env 6
+        - 47  # rls2101.rel NDRPDR iter RND env 6
+        - 48  # rls2101.rel NDRPDR iter RND env 6
+        - 49  # rls2101.rel NDRPDR iter RND env 6
+        - 50  # rls2101.rel NDRPDR iter RND env 6
+        - 51  # rls2101.rel NDRPDR iter RND env 6
+        - 52  # rls2101.rel NDRPDR iter RND env 6
 
     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-env4:
-      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
-    vpp-performance-changes-3n-tsh-ref-env5:
       csit-vpp-perf-report-iterative-2009-3n-tsh:
         - 8   # rls2005 NDRPDR iter env 5
         - 11  # rls2005 NDRPDR iter env 5
         - 39  # rls2005 NDRPDR iter env 5
         - 40  # rls2005 NDRPDR iter env 5
         - 42  # rls2005 NDRPDR iter env 5
-    vpp-performance-changes-3n-tsh-cmp:
+    vpp-performance-changes-3n-tsh-ref-env-old:
       csit-vpp-perf-report-iterative-2009-3n-tsh:
         - 14  # rls2009 NDRPDR iter env 5
         - 20  # rls2009 NDRPDR iter env 5
         - 33  # rls2009 NDRPDR iter env 5
         - 38  # rls2009 NDRPDR iter env 5
         - 41  # rls2009 NDRPDR iter env 5
+    vpp-performance-changes-3n-tsh-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-3n-tsh:
+        - 8   # rls2009 NDRPDR iter env 6
+        - 13  # rls2009 NDRPDR iter env 6
+        - 14  # rls2009 NDRPDR iter env 6
+        - 15  # rls2009 NDRPDR iter env 6
+        - 16  # rls2009 NDRPDR iter env 6
+        - 17  # rls2009 NDRPDR iter env 6
+        - 18  # rls2009 NDRPDR iter env 6
+        - 19  # rls2009 NDRPDR iter env 6
+        - 21  # rls2009 NDRPDR iter env 6
+    vpp-performance-changes-3n-tsh-cmp:
+      csit-vpp-perf-report-iterative-2101-3n-tsh:
+        - 23  # rls2101.rel NDRPDR iter env 6
+        - 24  # rls2101.rel NDRPDR iter env 6
+        - 25  # rls2101.rel NDRPDR iter env 6
+        - 26  # rls2101.rel NDRPDR iter env 6
+        - 27  # rls2101.rel NDRPDR iter env 6
+        - 28  # rls2101.rel NDRPDR iter env 6
+        - 29  # rls2101.rel NDRPDR iter env 6
+        - 30  # rls2101.rel NDRPDR iter env 6
+        - 31  # rls2101.rel NDRPDR iter env 6
+        - 32  # rls2101.rel NDRPDR iter env 6
+
+#     vpp-performance-changes-2n-tx2-h1:
+#       csit-vpp-perf-report-iterative-2009-2n-tx2:
+#         -
+#     vpp-performance-changes-2n-tx2-ref-env-old:
+#       csit-vpp-perf-report-iterative-2009-2n-tx2:
+#         -
+    vpp-performance-changes-2n-tx2-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-2n-tx2:
+        - 6   # rls2009 NDRPDR iter env 6
+        - 7   # rls2009 NDRPDR iter env 6
+        - 11  # rls2009 NDRPDR iter env 6
+        - 12  # rls2009 NDRPDR iter env 6
+        - 13  # rls2009 NDRPDR iter env 6
+        - 16  # rls2009 NDRPDR iter env 6
+        - 17  # rls2009 NDRPDR iter env 6
+        - 18  # rls2009 NDRPDR iter env 6
+        - 19  # rls2009 NDRPDR iter env 6
+        - 20  # rls2009 NDRPDR iter env 6
+    vpp-performance-changes-2n-tx2-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-tx2:
+        - 22  # rls2101.rel NDRPDR iter env 6
+        - 23  # rls2101.rel NDRPDR iter env 6
+        - 24  # rls2101.rel NDRPDR iter env 6
+        - 25  # rls2101.rel NDRPDR iter env 6
+        - 26  # rls2101.rel NDRPDR iter env 6
+        - 27  # rls2101.rel NDRPDR iter env 6
+        - 28  # rls2101.rel NDRPDR iter env 6
+        - 29  # rls2101.rel NDRPDR iter env 6
+        - 30  # rls2101.rel NDRPDR iter env 6
+        - 31  # rls2101.rel NDRPDR iter env 6
 
     vpp-soak-vs-ndr-2n-skx-ref:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 42  # rls2009 NDRPDR iter env 5
-        - 43  # rls2009 NDRPDR iter env 5
-        - 44  # rls2009 NDRPDR iter env 5
-        - 46  # rls2009 NDRPDR iter env 5
-        - 48  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 69  # rls2101.rel NDRPDR iter env 6
+        - 70  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 76  # rls2101.rel NDRPDR iter env 6
+        - 77  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 85  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 94  # rls2101.rel NDRPDR iter env 6
     vpp-soak-vs-ndr-2n-skx-cmp:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 33  # rls2009 soak env 5
-        - 34  # rls2009 soak env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 68  # rls2101.rel soak env 6
+        - 73  # rls2101.rel soak env 6
     vpp-soak-vs-ndr-2n-skx:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 42  # rls2009 NDRPDR iter env 5
-        - 43  # rls2009 NDRPDR iter env 5
-        - 44  # rls2009 NDRPDR iter env 5
-        - 46  # rls2009 NDRPDR iter env 5
-        - 48  # rls2009 NDRPDR iter env 5
-        - 33  # rls2009 soak env 5
-        - 34  # rls2009 soak env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 69  # rls2101.rel NDRPDR iter env 6
+        - 70  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 76  # rls2101.rel NDRPDR iter env 6
+        - 77  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 85  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 94  # rls2101.rel NDRPDR iter env 6
+        - 68  # rls2101.rel soak env 6
+        - 73  # rls2101.rel soak env 6
 
     vpp-soak-vs-ndr-2n-clx-ref:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 36  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 65  # rls2009 NDRPDR iter env 5
-        - 66  # rls2009 NDRPDR iter env 5
-        - 79  # rls2009 NDRPDR iter env 5
-        - 82  # rls2009 NDRPDR iter env 5
-        - 88  # rls2009 NDRPDR iter env 5
-        - 89  # rls2009 NDRPDR iter env 5
-        - 90  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 54  # rls2101.rel NDRPDR iter env 6
+        - 59  # rls2101.rel NDRPDR iter env 6
+        - 60  # rls2101.rel NDRPDR iter env 6
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 66  # rls2101.rel NDRPDR iter env 6
+        - 68  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 90  # rls2101.rel NDRPDR iter env 6
     vpp-soak-vs-ndr-2n-clx-cmp:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 33  # rls2009 soak env 5
-        - 34  # rls2009 soak env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 58  # rls2101.rel soak env 6
+        - 61  # rls2101.rel soak env 6
     vpp-soak-vs-ndr-2n-clx:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 36  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 65  # rls2009 NDRPDR iter env 5
-        - 66  # rls2009 NDRPDR iter env 5
-        - 79  # rls2009 NDRPDR iter env 5
-        - 82  # rls2009 NDRPDR iter env 5
-        - 88  # rls2009 NDRPDR iter env 5
-        - 89  # rls2009 NDRPDR iter env 5
-        - 90  # rls2009 NDRPDR iter env 5
-        - 33  # rls2009 soak env 5
-        - 34  # rls2009 soak env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 54  # rls2101.rel NDRPDR iter env 6
+        - 59  # rls2101.rel NDRPDR iter env 6
+        - 60  # rls2101.rel NDRPDR iter env 6
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 66  # rls2101.rel NDRPDR iter env 6
+        - 68  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 90  # rls2101.rel NDRPDR iter env 6
+        - 58  # rls2101.rel soak env 6
+        - 61  # rls2101.rel soak env 6
 
     vpp-performance-changes-3n-hsw-mrr-h1:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 17  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref-env4:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 30  # MRR env 4
-    vpp-performance-changes-3n-hsw-mrr-ref-env5:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
         - 18  # rls2005 MRR iter env 5
-    vpp-performance-changes-3n-hsw-mrr-cmp:
+    vpp-performance-changes-3n-hsw-mrr-ref-env-old:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
         - 23  # rls2009 MRR iter env 5
+    vpp-performance-changes-3n-hsw-mrr-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 17  # rls2009 MRR iter env 6
+    vpp-performance-changes-3n-hsw-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 63  # rls2101.rel MRR iter env 6
 
     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-ref-env4:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 49  # MRR sel env 4
-    vpp-performance-changes-3n-skx-mrr-ref-env5:
       csit-vpp-perf-report-iterative-2009-3n-skx:
         - 17  # rls2005 MRR iter env 5
-    vpp-performance-changes-3n-skx-mrr-cmp:
+    vpp-performance-changes-3n-skx-mrr-ref-env-old:
       csit-vpp-perf-report-iterative-2009-3n-skx:
         - 24  # rls2009 MRR iter env 5
+    vpp-performance-changes-3n-skx-mrr-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 34  # rls2009 MRR iter env 6
+    vpp-performance-changes-3n-skx-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 35  # rls2101.rel MRR iter env 6
 
     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-ref-env4:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 99  # MRR sel env 4
-    vpp-performance-changes-2n-skx-mrr-ref-env5:
       csit-vpp-perf-report-iterative-2009-2n-skx:
         - 20  # rls2005 MRR iter env 5
-    vpp-performance-changes-2n-skx-mrr-cmp:
+    vpp-performance-changes-2n-skx-mrr-ref-env-old:
       csit-vpp-perf-report-iterative-2009-2n-skx:
         - 120 # rls2009 MRR iter env 5
+    vpp-performance-changes-2n-skx-mrr-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 21  # rls2009 MRR iter env 6
+    vpp-performance-changes-2n-skx-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 62  # rls2101.rel MRR iter env 6
 
     vpp-performance-changes-2n-clx-mrr-h1:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 39  # MRR
-    vpp-performance-changes-2n-clx-mrr-ref-env4:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 72   # MRR sel env 4
-    vpp-performance-changes-2n-clx-mrr-ref-env5:
       csit-vpp-perf-report-iterative-2009-2n-clx:
         - 77  # rls2005 MRR iter env 5
-    vpp-performance-changes-2n-clx-mrr-cmp:
+    vpp-performance-changes-2n-clx-mrr-ref-env-old:
       csit-vpp-perf-report-iterative-2009-2n-clx:
         - 125 # rls2009 MRR iter env 5
+    vpp-performance-changes-2n-clx-mrr-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 15  # rls2009 MRR iter env 6
+    vpp-performance-changes-2n-clx-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 53  # rls2101.rel MRR iter env 6
+
+    vpp-performance-changes-2n-zn2-mrr-ref-env-old:
+      csit-vpp-perf-report-iterative-2009-2n-zn2:
+        - 15  # rls2009 MRR iter env 5
+    vpp-performance-changes-2n-zn2-mrr-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 8   # rls2009 MRR iter env6
+    vpp-performance-changes-2n-zn2-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-zn2:
+        - 30  # rls2101.rel MRR iter env 6
 
     vpp-performance-changes-2n-dnv-mrr-h1:
-      csit-vpp-perf-verify-2001-2n-dnv:
-        - 12  # MRR sel
-    vpp-performance-changes-2n-dnv-mrr-ref:
       csit-vpp-perf-report-iterative-2009-2n-dnv:
         - 23  # rls2005 MRR iter env 5
-    vpp-performance-changes-2n-dnv-mrr-cmp:
+    vpp-performance-changes-2n-dnv-mrr-ref-env-old:
+      csit-vpp-perf-report-iterative-2009-2n-dnv:
+        - 13  # rls2009 MRR iter env 5
+    vpp-performance-changes-2n-dnv-mrr-ref-env-new:
+      # TODO: Re-test in new env
       csit-vpp-perf-report-iterative-2009-2n-dnv:
         - 13  # rls2009 MRR iter env 5
+    vpp-performance-changes-2n-dnv-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-dnv:
+        - 31  # rls2101.rel MRR iter env 6
 
     vpp-performance-changes-3n-dnv-mrr-h1:
-      csit-vpp-perf-verify-2001-3n-dnv:
-        - 11  # MRR sel
-    vpp-performance-changes-3n-dnv-mrr-ref:
       csit-vpp-perf-report-iterative-2009-3n-dnv:
         - 19  # rls2005 MRR iter env 5
-    vpp-performance-changes-3n-dnv-mrr-cmp:
+    vpp-performance-changes-3n-dnv-mrr-ref-env-old:
       csit-vpp-perf-report-iterative-2009-3n-dnv:
         - 22  # rls2009 MRR iter env 5
+    vpp-performance-changes-3n-dnv-mrr-ref-env-new:
+      # TODO: Re-test in new env
+      csit-vpp-perf-report-iterative-2009-3n-dnv:
+        - 22  # rls2009 MRR iter env 5
+    vpp-performance-changes-3n-dnv-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-3n-dnv:
+        - 32  # rls2101.rel MRR iter env 6
 
     vpp-performance-changes-3n-tsh-mrr-h1:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 9   # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-ref-env4:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 27  # MRR sel env 4
-    vpp-performance-changes-3n-tsh-mrr-ref-env5:
       csit-vpp-perf-report-iterative-2009-3n-tsh:
         - 13  # rls2005 MRR iter env 5
-    vpp-performance-changes-3n-tsh-mrr-cmp:
+    vpp-performance-changes-3n-tsh-mrr-ref-env-old:
       csit-vpp-perf-report-iterative-2009-3n-tsh:
         - 15  # rls2009 MRR iter env 5
+    vpp-performance-changes-3n-tsh-mrr-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-3n-tsh:
+        - 7   # rls2009 MRR iter env 6
+    vpp-performance-changes-3n-tsh-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-3n-tsh:
+        - 22  # rls2101.rel MRR iter env 6
+
+#     vpp-performance-changes-2n-tx2-mrr-h1:
+#       csit-vpp-perf-report-iterative-2009-2n-tx2:
+#         -
+#     vpp-performance-changes-2n-tx2-mrr-ref-env-old:
+#       csit-vpp-perf-report-iterative-2009-2n-tx2:
+#         -
+    vpp-performance-changes-2n-tx2-mrr-ref-env-new:
+      csit-vpp-perf-report-iterative-2101-2n-tx2:
+        - 5   # rls2009 MRR iter env 6
+    vpp-performance-changes-2n-tx2-mrr-cmp:
+      csit-vpp-perf-report-iterative-2101-2n-tx2:
+        - 21  # rls2101.rel MRR iter env 6
 
     dpdk-performance-changes-3n-hsw-h1:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-        - 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
-        - 13  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # 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
         - 32  # NDRPDR iter
         - 33  # NDRPDR iter
         - 34  # NDRPDR iter
-    dpdk-performance-changes-3n-hsw-cmp:
+    dpdk-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-report-iterative-2009-3n-hsw:
         - 6   # NDRPDR iter env5
         - 7   # NDRPDR iter env5
         - 13  # NDRPDR iter env5
         - 14  # NDRPDR iter env5
         - 15  # NDRPDR iter env5
+    dpdk-performance-changes-3n-hsw-cmp:
+      csit-dpdk-perf-report-iterative-2101-3n-hsw:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 16  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
     dpdk-performance-changes-3n-skx-h1:
-      csit-dpdk-perf-verify-2001-3n-skx:
-        - 29  # NDRPDR sel xxv710
-        - 33  # NDRPDR sel xxv710
-        - 34  # NDRPDR sel xxv710
-        - 35  # NDRPDR sel xxv710
-        - 36  # NDRPDR sel xxv710
-        - 37  # NDRPDR sel xxv710
-        - 41  # NDRPDR sel xxv710
-        - 42  # NDRPDR sel xxv710
-        - 43  # NDRPDR sel xxv710
-        - 45  # NDRPDR sel xxv710
-        - 30  # NDRPDR sel x710
-        - 31  # NDRPDR sel x710
-        - 32  # NDRPDR sel x710
-        - 38  # NDRPDR sel x710
-        - 39  # NDRPDR sel x710
-        - 40  # NDRPDR sel x710
-        - 44  # NDRPDR sel x710
-        - 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
         - 35  # NDRPDR iter
         - 36  # NDRPDR iter
         - 37  # NDRPDR iter
-    dpdk-performance-changes-3n-skx-cmp:
+    dpdk-performance-changes-3n-skx-ref:
       csit-dpdk-perf-report-iterative-2009-3n-skx:
         - 4   # NDRPDR sel env5
         - 5   # NDRPDR sel env5
         - 11  # NDRPDR sel env5
         - 12  # NDRPDR sel env5
         - 13  # NDRPDR sel env5
+    dpdk-performance-changes-3n-skx-cmp:
+      csit-dpdk-perf-report-iterative-2101-3n-skx:
+        - 12  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 15  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
+        - 22  # rls2101 NDRPDR iter env 6
+        - 25  # rls2101 NDRPDR iter env 6
+        - 26  # rls2101 NDRPDR iter env 6
 
     dpdk-performance-changes-2n-skx-h1:
-      csit-dpdk-perf-verify-2001-2n-skx:
-        - 35  # NDRPDR sel xxv710
-        - 36  # NDRPDR sel xxv710
-        - 37  # NDRPDR sel xxv710
-        - 41  # NDRPDR sel xxv710
-        - 42  # NDRPDR sel xxv710
-        - 43  # NDRPDR sel xxv710
-        - 46  # NDRPDR sel xxv710
-        - 47  # NDRPDR sel xxv710
-        - 52  # NDRPDR sel xxv710
-        - 53  # NDRPDR sel xxv710
-        - 38  # NDRPDR sel x710
-        - 39  # NDRPDR sel x710
-        - 40  # NDRPDR sel x710
-        - 44  # NDRPDR sel x710
-        - 45  # NDRPDR sel x710
-        - 48  # NDRPDR sel x710
-        - 49  # NDRPDR sel x710
-        - 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
         - 27  # NDRPDR iter
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
-    dpdk-performance-changes-2n-skx-cmp:
+    dpdk-performance-changes-2n-skx-ref:
       csit-dpdk-perf-report-iterative-2009-2n-skx:
         - 4   # NDRPDR iter env5
         - 5   # NDRPDR iter env5
         - 11  # NDRPDR iter env5
         - 12  # NDRPDR iter env5
         - 13  # NDRPDR iter env5
+    dpdk-performance-changes-2n-skx-cmp:
+      csit-dpdk-perf-report-iterative-2101-2n-skx:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 15  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
     dpdk-performance-changes-2n-clx-h1:
-      csit-dpdk-perf-verify-2001-2n-clx:
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # 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
         - 27  # NDRPDR iter
         - 28  # NDRPDR iter
         - 29  # NDRPDR iter
-    dpdk-performance-changes-2n-clx-cmp:
+    dpdk-performance-changes-2n-clx-ref:
       csit-dpdk-perf-report-iterative-2009-2n-clx:
         - 4   # NDRPDR iter env5
         - 5   # NDRPDR iter env5
         - 11  # NDRPDR iter env5
         - 12  # NDRPDR iter env5
         - 13  # NDRPDR iter env5
+    dpdk-performance-changes-2n-clx-cmp:
+      csit-dpdk-perf-report-iterative-2101-2n-clx:
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 22  # rls2101 NDRPDR iter env 6
+
+    dpdk-performance-changes-2n-zn2-ref:
+      csit-dpdk-perf-report-iterative-2009-2n-zn2:
+        - 16  # NDRPDR iter env5
+        - 21  # NDRPDR iter env5
+        - 22  # NDRPDR iter env5
+        - 23  # NDRPDR iter env5
+        - 24  # NDRPDR iter env5
+        - 25  # NDRPDR iter env5
+        - 29  # NDRPDR iter env5
+    dpdk-performance-changes-2n-zn2-cmp:
+      csit-dpdk-perf-report-iterative-2101-2n-zn2:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 16  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
 #    dpdk-performance-changes-2n-dnv-h1:
-#      csit-dpdk-perf-verify-2001-2n-dnv:
+#      csit-dpdk-perf-verify-2101-2n-dnv:
 #        - 9   # NDRPDR sel
 #        - 10  # NDRPDR sel
 #        - 11  # NDRPDR sel
 #      csit-dpdk-perf-report-iterative-2009-2n-dnv:
 
 #    dpdk-performance-changes-3n-dnv-h1:
-#      csit-dpdk-perf-verify-2001-3n-dnv:
+#      csit-dpdk-perf-verify-2101-3n-dnv:
 #        - 12  # NDRPDR sel
 #        - 13  # NDRPDR sel
 #        - 14  # NDRPDR sel
 #      csit-dpdk-perf-report-iterative-2009-3n-dnv:
 
     dpdk-performance-changes-3n-tsh-h1:
-      csit-dpdk-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # 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:
+    dpdk-performance-changes-3n-tsh-ref:
       csit-dpdk-perf-report-iterative-2009-3n-tsh:
         - 1   # NDRPDR iter env5
         - 2   # NDRPDR iter env5
         - 9   # NDRPDR iter env5
         - 10  # NDRPDR iter env5
         - 11  # NDRPDR iter env5
+    dpdk-performance-changes-3n-tsh-cmp:
+      csit-dpdk-perf-report-iterative-2101-3n-tsh:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 16  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 21  # rls2009 NDRPDR iter env 5
-        - 22  # rls2009 NDRPDR iter env 5
-        - 24  # rls2009 NDRPDR iter env 5
-        - 25  # rls2009 NDRPDR iter env 5
-        - 26  # rls2009 NDRPDR iter env 5
-        - 27  # rls2009 NDRPDR iter env 5
-        - 28  # rls2009 NDRPDR iter env 5
-        - 29  # rls2009 NDRPDR iter env 5
-        - 30  # rls2009 NDRPDR iter env 5
-        - 31  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 64  # rls2101.rel NDRPDR iter env 6
+        - 71  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 74  # rls2101.rel NDRPDR iter env 6
+        - 80  # rls2101.rel NDRPDR iter env 6
+        - 81  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 83  # rls2101.rel NDRPDR iter env 6
+        - 88  # rls2101.rel NDRPDR iter env 6
+        - 89  # rls2101.rel NDRPDR iter env 6
     vpp-compare-testbeds-cmp:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 26  # rls2009 NDRPDR iter env 5
-        - 27  # rls2009 NDRPDR iter env 5
-        - 28  # rls2009 NDRPDR iter env 5
-        - 29  # rls2009 NDRPDR iter env 5
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 38  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 40  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 47  # rls2101.rel NDRPDR iter env 6
+        - 48  # rls2101.rel NDRPDR iter env 6
+        - 50  # rls2101.rel NDRPDR iter env 6
 
     vpp-compare-testbeds-skx-clx-ref:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 42  # rls2009 NDRPDR iter env 5
-        - 43  # rls2009 NDRPDR iter env 5
-        - 44  # rls2009 NDRPDR iter env 5
-        - 46  # rls2009 NDRPDR iter env 5
-        - 48  # rls2009 NDRPDR iter env 5
-        - 110 # rls2009 NDRPDR iter NAT44 env 5
-        - 111 # rls2009 NDRPDR iter NAT44 env 5
-        - 112 # rls2009 NDRPDR iter NAT44 env 5
-        - 113 # rls2009 NDRPDR iter NAT44 env 5
-        - 114 # rls2009 NDRPDR iter NAT44 env 5
-        - 115 # rls2009 NDRPDR iter NAT44 env 5
-        - 116 # rls2009 NDRPDR iter NAT44 env 5
-        - 118 # rls2009 NDRPDR iter NAT44 env 5
-        - 119 # rls2009 NDRPDR iter NAT44 env 5
-        - 121 # rls2009 NDRPDR iter NAT44 env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 69  # rls2101.rel NDRPDR iter env 6
+        - 70  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 76  # rls2101.rel NDRPDR iter env 6
+        - 77  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 85  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 94  # rls2101.rel NDRPDR iter env 6
+        - 89  # rls2101.rel NDRPDR iter RND env 6
+        - 90  # rls2101.rel NDRPDR iter RND env 6
+        - 91  # rls2101.rel NDRPDR iter RND env 6
+        - 92  # rls2101.rel NDRPDR iter RND env 6
+        - 93  # rls2101.rel NDRPDR iter RND env 6
+        - 96  # rls2101.rel NDRPDR iter RND env 6
+        - 98  # rls2101.rel NDRPDR iter RND env 6
+        - 99  # rls2101.rel NDRPDR iter RND env 6
+        - 101 # rls2101.rel NDRPDR iter RND env 6
+        - 102 # rls2101.rel NDRPDR iter RND env 6
+        - 116 # rls2101.rel NDRPDR iter NAT env 6
+        - 117 # rls2101.rel NDRPDR iter NAT env 6
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
+        - 119 # rls2101.rel NDRPDR iter NAT env 6
+        - 120 # rls2101.rel NDRPDR iter NAT env 6
+        - 121 # rls2101.rel NDRPDR iter NAT env 6
+        - 122 # rls2101.rel NDRPDR iter NAT env 6
+        - 123 # rls2101.rel NDRPDR iter NAT env 6
+        - 124 # rls2101.rel NDRPDR iter NAT env 6
+        - 125 # rls2101.rel NDRPDR iter NAT env 6
     vpp-compare-testbeds-skx-clx-cmp:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 36  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 65  # rls2009 NDRPDR iter env 5
-        - 66  # rls2009 NDRPDR iter env 5
-        - 79  # rls2009 NDRPDR iter env 5
-        - 82  # rls2009 NDRPDR iter env 5
-        - 88  # rls2009 NDRPDR iter env 5
-        - 89  # rls2009 NDRPDR iter env 5
-        - 90  # rls2009 NDRPDR iter env 5
-        - 114 # rls2009 NDRPDR iter NAT44 env 5
-        - 115 # rls2009 NDRPDR iter NAT44 env 5
-        - 116 # rls2009 NDRPDR iter NAT44 env 5
-        - 117 # rls2009 NDRPDR iter NAT44 env 5
-        - 118 # rls2009 NDRPDR iter NAT44 env 5
-        - 119 # rls2009 NDRPDR iter NAT44 env 5
-        - 121 # rls2009 NDRPDR iter NAT44 env 5
-        - 122 # rls2009 NDRPDR iter NAT44 env 5
-        - 123 # rls2009 NDRPDR iter NAT44 env 5
-        - 126 # rls2009 NDRPDR iter NAT44 env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 54  # rls2101.rel NDRPDR iter env 6
+        - 59  # rls2101.rel NDRPDR iter env 6
+        - 60  # rls2101.rel NDRPDR iter env 6
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 66  # rls2101.rel NDRPDR iter env 6
+        - 68  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 90  # rls2101.rel NDRPDR iter env 6
+        - 80  # rls2101.rel NDRPDR iter RND env 6
+        - 87  # rls2101.rel NDRPDR iter RND env 6
+        - 91  # rls2101.rel NDRPDR iter RND env 6
+        - 92  # rls2101.rel NDRPDR iter RND env 6
+        - 93  # rls2101.rel NDRPDR iter RND env 6
+        - 94  # rls2101.rel NDRPDR iter RND env 6
+        - 95  # rls2101.rel NDRPDR iter RND env 6
+        - 100 # rls2101.rel NDRPDR iter RND env 6
+        - 106 # rls2101.rel NDRPDR iter RND env 6
+        - 108 # rls2101.rel NDRPDR iter RND env 6
+        - 112 # rls2101.rel NDRPDR iter NAT env 6
+        - 113 # rls2101.rel NDRPDR iter NAT env 6
+        - 114 # rls2101.rel NDRPDR iter NAT env 6
+        - 115 # rls2101.rel NDRPDR iter NAT env 6
+        - 116 # rls2101.rel NDRPDR iter NAT env 6
+        - 117 # rls2101.rel NDRPDR iter NAT env 6
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
+        - 119 # rls2101.rel NDRPDR iter NAT env 6
+        - 120 # rls2101.rel NDRPDR iter NAT env 6
+        - 121 # rls2101.rel NDRPDR iter NAT env 6
 
     vpp-compare-testbeds-hsw-clx-ref:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 21  # rls2009 NDRPDR iter env 5
-        - 22  # rls2009 NDRPDR iter env 5
-        - 24  # rls2009 NDRPDR iter env 5
-        - 25  # rls2009 NDRPDR iter env 5
-        - 26  # rls2009 NDRPDR iter env 5
-        - 27  # rls2009 NDRPDR iter env 5
-        - 28  # rls2009 NDRPDR iter env 5
-        - 29  # rls2009 NDRPDR iter env 5
-        - 30  # rls2009 NDRPDR iter env 5
-        - 31  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 64  # rls2101.rel NDRPDR iter env 6
+        - 71  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 74  # rls2101.rel NDRPDR iter env 6
+        - 80  # rls2101.rel NDRPDR iter env 6
+        - 81  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 83  # rls2101.rel NDRPDR iter env 6
+        - 88  # rls2101.rel NDRPDR iter env 6
+        - 89  # rls2101.rel NDRPDR iter env 6
+        - 128 # rls2101.rel NDRPDR iter RND env 6
+        - 129 # rls2101.rel NDRPDR iter RND env 6
+        - 130 # rls2101.rel NDRPDR iter RND env 6
+        - 131 # rls2101.rel NDRPDR iter RND env 6
+        - 132 # rls2101.rel NDRPDR iter RND env 6
+        - 133 # rls2101.rel NDRPDR iter RND env 6
+        - 134 # rls2101.rel NDRPDR iter RND env 6
+        - 135 # rls2101.rel NDRPDR iter RND env 6
+        - 136 # rls2101.rel NDRPDR iter RND env 6
+        - 137 # rls2101.rel NDRPDR iter RND env 6
     vpp-compare-testbeds-hsw-clx-cmp:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 36  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 65  # rls2009 NDRPDR iter env 5
-        - 66  # rls2009 NDRPDR iter env 5
-        - 79  # rls2009 NDRPDR iter env 5
-        - 82  # rls2009 NDRPDR iter env 5
-        - 88  # rls2009 NDRPDR iter env 5
-        - 89  # rls2009 NDRPDR iter env 5
-        - 90  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 54  # rls2101.rel NDRPDR iter env 6
+        - 59  # rls2101.rel NDRPDR iter env 6
+        - 60  # rls2101.rel NDRPDR iter env 6
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 66  # rls2101.rel NDRPDR iter env 6
+        - 68  # rls2101.rel NDRPDR iter env 6
+        - 73  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 90  # rls2101.rel NDRPDR iter env 6
+        - 80  # rls2101.rel NDRPDR iter RND env 6
+        - 87  # rls2101.rel NDRPDR iter RND env 6
+        - 91  # rls2101.rel NDRPDR iter RND env 6
+        - 92  # rls2101.rel NDRPDR iter RND env 6
+        - 93  # rls2101.rel NDRPDR iter RND env 6
+        - 94  # rls2101.rel NDRPDR iter RND env 6
+        - 95  # rls2101.rel NDRPDR iter RND env 6
+        - 100 # rls2101.rel NDRPDR iter RND env 6
+        - 106 # rls2101.rel NDRPDR iter RND env 6
+        - 108 # rls2101.rel NDRPDR iter RND env 6
+        - 112 # rls2101.rel NDRPDR iter NAT env 6
+        - 113 # rls2101.rel NDRPDR iter NAT env 6
+        - 114 # rls2101.rel NDRPDR iter NAT env 6
+        - 115 # rls2101.rel NDRPDR iter NAT env 6
+        - 116 # rls2101.rel NDRPDR iter NAT env 6
+        - 117 # rls2101.rel NDRPDR iter NAT env 6
+        - 118 # rls2101.rel NDRPDR iter NAT env 6
+        - 119 # rls2101.rel NDRPDR iter NAT env 6
+        - 120 # rls2101.rel NDRPDR iter NAT env 6
+        - 121 # rls2101.rel NDRPDR iter NAT env 6
 
     vpp-compare-testbeds-mrr-ref:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 23  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 63  # rls2101.rel MRR iter env 6
     vpp-compare-testbeds-mrr-cmp:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 24  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 35  # rls2101.rel MRR iter env 6
 
     vpp-compare-testbeds-mrr-skx-clx-ref:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 120 # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 62  # rls2101.rel MRR iter env 6
     vpp-compare-testbeds-mrr-skx-clx-cmp:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 125 # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 53  # rls2101.rel MRR iter env 6
 
     vpp-compare-testbeds-mrr-hsw-clx-ref:
-      csit-vpp-perf-report-iterative-2009-3n-hsw:
-        - 23  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-hsw:
+        - 63  # rls2101.rel MRR iter env 6
     vpp-compare-testbeds-mrr-hsw-clx-cmp:
-      csit-vpp-perf-report-iterative-2009-2n-clx:
-        - 125 # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-clx:
+        - 53  # rls2101.rel MRR iter env 6
 
     dpdk-compare-testbeds-ref:
-      csit-dpdk-perf-report-iterative-2009-3n-hsw:
-        - 6   # NDRPDR iter env5
-        - 7   # NDRPDR iter env5
-        - 8   # NDRPDR iter env5
-        - 9   # NDRPDR iter env5
-        - 10  # NDRPDR iter env5
-        - 11  # NDRPDR iter env5
-        - 12  # NDRPDR iter env5
-        - 13  # NDRPDR iter env5
-        - 14  # NDRPDR iter env5
-        - 15  # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-3n-hsw:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 16  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
     dpdk-compare-testbeds-cmp:
-      csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 4   # NDRPDR sel env5
-        - 5   # NDRPDR sel env5
-        - 6   # NDRPDR sel env5
-        - 7   # NDRPDR sel env5
-        - 8   # NDRPDR sel env5
-        - 9   # NDRPDR sel env5
-        - 14  # NDRPDR sel env5
-        - 11  # NDRPDR sel env5
-        - 12  # NDRPDR sel env5
-        - 13  # NDRPDR sel env5
+      csit-dpdk-perf-report-iterative-2101-3n-skx:
+        - 12  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 15  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
+        - 22  # rls2101 NDRPDR iter env 6
+        - 25  # rls2101 NDRPDR iter env 6
+        - 26  # rls2101 NDRPDR iter env 6
 
     dpdk-compare-testbeds-skx-clx-ref:
-      csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 4   # NDRPDR iter env5
-        - 5   # NDRPDR iter env5
-        - 6   # NDRPDR iter env5
-        - 7   # NDRPDR iter env5
-        - 8   # NDRPDR iter env5
-        - 9   # NDRPDR iter env5
-        - 10  # NDRPDR iter env5
-        - 11  # NDRPDR iter env5
-        - 12  # NDRPDR iter env5
-        - 13  # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-skx:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 15  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
     dpdk-compare-testbeds-skx-clx-cmp:
-      csit-dpdk-perf-report-iterative-2009-2n-clx:
-        - 4   # NDRPDR iter env5
-        - 5   # NDRPDR iter env5
-        - 6   # NDRPDR iter env5
-        - 7   # NDRPDR iter env5
-        - 8   # NDRPDR iter env5
-        - 9   # NDRPDR iter env5
-        - 10  # NDRPDR iter env5
-        - 11  # NDRPDR iter env5
-        - 12  # NDRPDR iter env5
-        - 13  # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-clx:
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 22  # rls2101 NDRPDR iter env 6
 
     # Compare topologies
 
     vpp-compare-topologies-ref:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 26  # rls2009 NDRPDR iter env 5
-        - 27  # rls2009 NDRPDR iter env 5
-        - 28  # rls2009 NDRPDR iter env 5
-        - 29  # rls2009 NDRPDR iter env 5
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 38  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 36  # rls2101.rel NDRPDR iter env 6
+        - 37  # rls2101.rel NDRPDR iter env 6
+        - 38  # rls2101.rel NDRPDR iter env 6
+        - 39  # rls2101.rel NDRPDR iter env 6
+        - 40  # rls2101.rel NDRPDR iter env 6
+        - 41  # rls2101.rel NDRPDR iter env 6
+        - 42  # rls2101.rel NDRPDR iter env 6
+        - 47  # rls2101.rel NDRPDR iter env 6
+        - 48  # rls2101.rel NDRPDR iter env 6
+        - 50  # rls2101.rel NDRPDR iter env 6
     vpp-compare-topologies-cmp:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 35  # rls2009 NDRPDR iter env 5
-        - 36  # rls2009 NDRPDR iter env 5
-        - 37  # rls2009 NDRPDR iter env 5
-        - 39  # rls2009 NDRPDR iter env 5
-        - 40  # rls2009 NDRPDR iter env 5
-        - 42  # rls2009 NDRPDR iter env 5
-        - 43  # rls2009 NDRPDR iter env 5
-        - 44  # rls2009 NDRPDR iter env 5
-        - 46  # rls2009 NDRPDR iter env 5
-        - 48  # rls2009 NDRPDR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 63  # rls2101.rel NDRPDR iter env 6
+        - 69  # rls2101.rel NDRPDR iter env 6
+        - 70  # rls2101.rel NDRPDR iter env 6
+        - 75  # rls2101.rel NDRPDR iter env 6
+        - 76  # rls2101.rel NDRPDR iter env 6
+        - 77  # rls2101.rel NDRPDR iter env 6
+        - 82  # rls2101.rel NDRPDR iter env 6
+        - 85  # rls2101.rel NDRPDR iter env 6
+        - 86  # rls2101.rel NDRPDR iter env 6
+        - 94  # rls2101.rel NDRPDR iter env 6
 
     vpp-compare-topologies-mrr-ref:
-      csit-vpp-perf-report-iterative-2009-3n-skx:
-        - 24  # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-3n-skx:
+        - 35  # rls2101.rel MRR iter env 6
     vpp-compare-topologies-mrr-cmp:
-      csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 120 # rls2009 MRR iter env 5
+      csit-vpp-perf-report-iterative-2101-2n-skx:
+        - 62  # rls2101.rel MRR iter env 6
 
     dpdk-compare-topologies-ref:
-      csit-dpdk-perf-report-iterative-2009-3n-skx:
-        - 4   # NDRPDR sel env5
-        - 5   # NDRPDR sel env5
-        - 6   # NDRPDR sel env5
-        - 7   # NDRPDR sel env5
-        - 8   # NDRPDR sel env5
-        - 9   # NDRPDR sel env5
-        - 14  # NDRPDR sel env5
-        - 11  # NDRPDR sel env5
-        - 12  # NDRPDR sel env5
-        - 13  # NDRPDR sel env5
+      csit-dpdk-perf-report-iterative-2101-3n-skx:
+        - 12  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 15  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
+        - 22  # rls2101 NDRPDR iter env 6
+        - 25  # rls2101 NDRPDR iter env 6
+        - 26  # rls2101 NDRPDR iter env 6
     dpdk-compare-topologies-cmp:
-      csit-dpdk-perf-report-iterative-2009-2n-skx:
-        - 4   # NDRPDR iter env5
-        - 5   # NDRPDR iter env5
-        - 6   # NDRPDR iter env5
-        - 7   # NDRPDR iter env5
-        - 8   # NDRPDR iter env5
-        - 9   # NDRPDR iter env5
-        - 10  # NDRPDR iter env5
-        - 11  # NDRPDR iter env5
-        - 12  # NDRPDR iter env5
-        - 13  # NDRPDR iter env5
+      csit-dpdk-perf-report-iterative-2101-2n-skx:
+        - 11  # rls2101 NDRPDR iter env 6
+        - 12  # rls2101 NDRPDR iter env 6
+        - 13  # rls2101 NDRPDR iter env 6
+        - 14  # rls2101 NDRPDR iter env 6
+        - 15  # rls2101 NDRPDR iter env 6
+        - 17  # rls2101 NDRPDR iter env 6
+        - 18  # rls2101 NDRPDR iter env 6
+        - 19  # rls2101 NDRPDR iter env 6
+        - 20  # rls2101 NDRPDR iter env 6
+        - 21  # rls2101 NDRPDR iter env 6
 
   plot-layouts:
 
           yanchor: "bottom"
           yref: "paper"
 
-    plot-hdrh-latency-percentile:
+    plot-hdrh-latency-percentile-x-log:
       title:
-        text: ""
+        text: "<b>Latency by Percentile Distribution</b>"
         xanchor: "center"
         x: 0.5
+        font:
+          size: 18
+      showlegend: True
+      legend:
+        traceorder: "normal"
+        orientation: "h"
         font:
           size: 16
+        xanchor: "left"
+        yanchor: "top"
+        x: 0
+        y: -0.2
+        bgcolor: "rgba(255, 255, 255, 0)"
+        bordercolor: "rgba(255, 255, 255, 0)"
       xaxis:
         type: "log"
         title: "<b>Percentile [%]</b>"
         titlefont:
           size: 14
-        autorange: True
-        fixedrange: False
+        autorange: False
+        fixedrange: True
         gridcolor: "rgb(230, 230, 230)"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showline: True
         showticklabels: True
         tickcolor: "rgb(220, 220, 220)"
-        tickvals: [1, 2, 1e1, 20, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8]
-        ticktext: [0, 50, 90, 95, 99, 99.9, 99.99, 99.999, 99.9999, 99.99999, 99.999999]
+        tickvals: [1, 2, 1e1, 20, 1e2, 1e3, 1e4, 1e5, 1e6]
+        ticktext: [0, 50, 90, 95, 99, 99.9, 99.99, 99.999, 99.9999]
         tickfont:
           size: 14
       yaxis:
-        title: "<b>Packet Latency [uSec]</b>"
+        title: "<b>One-Way Latency per Direction [uSec]</b>"
         titlefont:
           size: 14
         gridcolor: "rgb(230, 230, 230)"
         tickfont:
           size: 14
       autosize: False
-      showlegend: True
-      legend:
-        traceorder: "normal"
-        orientation: "h"
-        font:
-          size: 14
-        xanchor: "left"
-        yanchor: "top"
-        x: 0
-        y: -0.15
-        bgcolor: "rgba(255, 255, 255, 0)"
-        bordercolor: "rgba(255, 255, 255, 0)"
       width: 700
       height: 700
       paper_bgcolor: "white"
 
   builds:
 
-    csit-vpp-perf-verify-2001-3n-hsw:
-      - 17  # MRR sel
-    csit-vpp-perf-report-iterative-2005-3n-hsw:
-      - 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
-      - 30  # MRR env 4
-      - 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
     csit-vpp-perf-report-iterative-2009-3n-hsw:
       - 18  # rls2005 MRR iter env 5
       - 9   # rls2005 NDRPDR iter env 5
       - 29  # rls2009 NDRPDR iter env 5
       - 30  # rls2009 NDRPDR iter env 5
       - 31  # rls2009 NDRPDR iter env 5
-      - 32  # rls2009 Hoststack iter env 5
-      - 33  # rls2009 Hoststack iter env 5
-      - 34  # rls2009 Hoststack iter env 5
-      - 35  # rls2009 Hoststack iter env 5
-      - 36  # rls2009 Hoststack iter env 5
-      - 37  # rls2009 Hoststack iter env 5
-      - 38  # rls2009 Hoststack iter env 5
-      - 39  # rls2009 Hoststack iter env 5
-      - 40  # rls2009 Hoststack iter env 5
-      - 41  # rls2009 Hoststack iter env 5
-    csit-vpp-perf-report-coverage-2009-3n-hsw:
-      - 3   # rls2009 NDRPDR cov 3n-hsw-crypto-00
-      - 4   # rls2009 NDRPDR cov 3n-hsw-crypto-01
-      - 5   # rls2009 NDRPDR cov 3n-hsw-crypto-02
-      - 6   # rls2009 NDRPDR cov 3n-hsw-crypto-03
-      - 7   # rls2009 NDRPDR cov 3n-hsw-ip4-00
-      - 8   # rls2009 NDRPDR cov 3n-hsw-ip4-01
-      - 9   # rls2009 NDRPDR cov 3n-hsw-ip4-02
-      - 10  # rls2009 NDRPDR cov 3n-hsw-ip4-03
-      - 11  # rls2009 NDRPDR cov 3n-hsw-ip4-04
-      - 12  # rls2009 NDRPDR cov 3n-hsw-ip4-05
-      - 13  # rls2009 NDRPDR cov 3n-hsw-ip4-06
-      - 14  # rls2009 NDRPDR cov 3n-hsw-ip4-07
-      - 15  # rls2009 NDRPDR cov 3n-hsw-ip4tun-00
-      - 16  # rls2009 NDRPDR cov 3n-hsw-ip4tun-01
-      - 17  # rls2009 NDRPDR cov 3n-hsw-ip4tun-02
-      - 18  # rls2009 NDRPDR cov 3n-hsw-ip6-00
-      - 19  # rls2009 NDRPDR cov 3n-hsw-ip6-01
-      - 20  # rls2009 NDRPDR cov 3n-hsw-ip6tun-00
-      - 21  # rls2009 NDRPDR cov 3n-hsw-l2-00
-      - 22  # rls2009 NDRPDR cov 3n-hsw-l2-01
-      - 23  # rls2009 NDRPDR cov 3n-hsw-l2-01
-      - 24  # rls2009 NDRPDR cov 3n-hsw-l2-03
-      - 25  # rls2009 NDRPDR cov 3n-hsw-l2-04
-      - 26  # rls2009 NDRPDR cov 3n-hsw-l2-05
-      - 27  # rls2009 NDRPDR cov 3n-hsw-l2-06
-      - 28  # rls2009 NDRPDR cov 3n-hsw-l2-07
-      - 29  # rls2009 NDRPDR cov 3n-hsw-l2-08
-      - 30  # rls2009 NDRPDR cov 3n-hsw-l2-09
-      - 31  # rls2009 NDRPDR cov 3n-hsw-l2-10
-      - 32  # rls2009 NDRPDR cov 3n-hsw-memif-00
-      - 33  # rls2009 NDRPDR cov 3n-hsw-srv6-00
-      - 34  # rls2009 NDRPDR cov 3n-hsw-srv6-01
-      - 35  # rls2009 NDRPDR cov 3n-hsw-vhost-00
-      - 36  # rls2009 NDRPDR cov 3n-hsw-vhost-01
-      - 37  # rls2009 NDRPDR cov 3n-hsw-vhost-02
-
-    csit-vpp-perf-verify-2001-3n-skx:
-      - 50  # MRR sel
-      - 53  # MRR sel addition
-    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
-      - 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
-      - 49  # MRR sel env 4
+    csit-vpp-perf-report-iterative-2101-3n-hsw:
+      - 17  # rls2009 MRR iter env 6
+      - 19  # rls2009 NDRPDR iter env 6
+      - 20  # rls2009 NDRPDR iter env 6
+      - 21  # rls2009 NDRPDR iter env 6
+      - 22  # rls2009 NDRPDR iter env 6
+      - 23  # rls2009 NDRPDR iter env 6
+      - 24  # rls2009 NDRPDR iter env 6
+      - 25  # rls2009 NDRPDR iter env 6
+      - 26  # rls2009 NDRPDR iter env 6
+      - 27  # rls2009 NDRPDR iter env 6
+      - 63  # rls2101.rel MRR iter env 6
+      - 64  # rls2101.rel NDRPDR iter env 6
+      - 71  # rls2101.rel NDRPDR iter env 6
+      - 73  # rls2101.rel NDRPDR iter env 6
+      - 74  # rls2101.rel NDRPDR iter env 6
+      - 80  # rls2101.rel NDRPDR iter env 6
+      - 81  # rls2101.rel NDRPDR iter env 6
+      - 82  # rls2101.rel NDRPDR iter env 6
+      - 83  # rls2101.rel NDRPDR iter env 6
+      - 88  # rls2101.rel NDRPDR iter env 6
+      - 89  # rls2101.rel NDRPDR iter env 6
+      - 128 # rls2101.rel NDRPDR iter RND env 6
+      - 129 # rls2101.rel NDRPDR iter RND env 6
+      - 130 # rls2101.rel NDRPDR iter RND env 6
+      - 131 # rls2101.rel NDRPDR iter RND env 6
+      - 132 # rls2101.rel NDRPDR iter RND env 6
+      - 133 # rls2101.rel NDRPDR iter RND env 6
+      - 134 # rls2101.rel NDRPDR iter RND env 6
+      - 135 # rls2101.rel NDRPDR iter RND env 6
+      - 136 # rls2101.rel NDRPDR iter RND env 6
+      - 137 # rls2101.rel NDRPDR iter RND env 6
+      - 65  # rls2101.rel NDRPDR reconf iter env 6
+      - 68  # rls2101.rel NDRPDR reconf iter env 6
+      - 77  # rls2101.rel NDRPDR reconf iter env 6
+      - 84  # rls2101.rel NDRPDR reconf iter env 6
+      - 90  # rls2101.rel NDRPDR reconf iter env 6
+      - 96  # rls2101.rel NDRPDR reconf iter env 6
+      - 101 # rls2101.rel NDRPDR reconf iter env 6
+      - 104 # rls2101.rel NDRPDR reconf iter env 6
+      - 105 # rls2101.rel NDRPDR reconf iter env 6
+      - 106 # rls2101.rel NDRPDR reconf iter env 6
+      - 107 # rls2101.rel NDRPDR reconf iter env 6
+      - 108 # rls2101.rel NDRPDR reconf iter env 6
+      - 110 # rls2101.rel NDRPDR reconf iter env 6
+      - 111 # rls2101.rel NDRPDR reconf iter env 6
+      - 112 # rls2101.rel NDRPDR reconf iter env 6
+      - 113 # rls2101.rel NDRPDR reconf iter env 6
+      - 114 # rls2101.rel NDRPDR reconf iter env 6
+      - 115 # rls2101.rel NDRPDR reconf iter env 6
+      - 116 # rls2101.rel NDRPDR reconf iter env 6
+      - 117 # rls2101.rel NDRPDR reconf iter env 6
+      - 69  # rls2101.rel Hoststack iter env 6
+      - 70  # rls2101.rel Hoststack iter env 6
+      - 75  # rls2101.rel Hoststack iter env 6
+      - 76  # rls2101.rel Hoststack iter env 6
+      - 78  # rls2101.rel Hoststack iter env 6
+      - 79  # rls2101.rel Hoststack iter env 6
+      - 85  # rls2101.rel Hoststack iter env 6
+      - 86  # rls2101.rel Hoststack iter env 6
+      - 87  # rls2101.rel Hoststack iter env 6
+      - 91  # rls2101.rel Hoststack iter env 6
+      - 92  # rls2101.rel Hoststack iter env 6
+      - 93  # rls2101.rel Hoststack iter env 6
+      - 94  # rls2101.rel Hoststack iter env 6
+      - 95  # rls2101.rel Hoststack iter env 6
+      - 97  # rls2101.rel Hoststack iter env 6
+      - 98  # rls2101.rel Hoststack iter env 6
+      - 99  # rls2101.rel Hoststack iter env 6
+      - 100 # rls2101.rel Hoststack iter env 6
+      - 102 # rls2101.rel Hoststack iter env 6
+      - 103 # rls2101.rel Hoststack iter env 6
+    csit-vpp-perf-report-coverage-2101-3n-hsw:
+      - 1   # rls2101.rel NDRPDR cov env 6 3n-hsw-crypto-00
+      - 2   # rls2101.rel NDRPDR cov env 6 3n-hsw-crypto-01
+      - 3   # rls2101.rel NDRPDR cov env 6 3n-hsw-crypto-02
+      - 4   # rls2101.rel NDRPDR cov env 6 3n-hsw-crypto-03
+      - 5   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-00
+      - 6   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-01
+      - 7   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-02
+      - 8   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-03
+      - 9   # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-04
+      - 10  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-05
+      - 11  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-06
+      - 12  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4-07
+      - 13  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4tun-00
+      - 14  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4tun-01
+      - 15  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip4tun-02
+      - 16  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip6-00
+      - 18  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip6-01
+      - 19  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-00
+      - 20  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-01
+      - 21  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-02
+      - 22  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-03
+      - 23  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-04
+      - 24  # rls2101.rel NDRPDR cov env 6 3n-hsw-ip6tun-00
+      - 25  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-05
+      - 26  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-06
+      - 27  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-07
+      - 28  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-08
+      - 29  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-09
+      - 30  # rls2101.rel NDRPDR cov env 6 3n-hsw-l2-10
+      - 31  # rls2101.rel NDRPDR cov env 6 3n-hsw-memif-00
+      - 32  # rls2101.rel NDRPDR cov env 6 3n-hsw-srv6-00
+      - 33  # rls2101.rel NDRPDR cov env 6 3n-hsw-srv6-01
+      - 34  # rls2101.rel NDRPDR cov env 6 3n-hsw-vhost-00
+      - 35  # rls2101.rel NDRPDR cov env 6 3n-hsw-vhost-01
+      - 36  # rls2101.rel NDRPDR cov env 6 3n-hsw-vhost-02
+
+
     csit-vpp-perf-report-iterative-2009-3n-skx:
       - 17  # rls2005 MRR iter env 5
       - 13  # rls2005 NDRPDR iter env 5
       - 38  # rls2009 NDRPDR iter env 5
       - 39  # rls2009 NDRPDR iter env 5
       - 40  # rls2009 NDRPDR iter env 5
-    csit-vpp-perf-report-coverage-2009-3n-skx:
-      - 36  # rls2009 NDRPDR cov 3n-skx-crypto-00
-      - 3   # rls2009 NDRPDR cov 3n-skx-crypto-01
-      - 4   # rls2009 NDRPDR cov 3n-skx-crypto-02
-      - 37  # rls2009 NDRPDR cov 3n-skx-crypto-03
-      - 6   # rls2009 NDRPDR cov 3n-skx-ip4-00
-      - 7   # rls2009 NDRPDR cov 3n-skx-ip4-01
-      - 8   # rls2009 NDRPDR cov 3n-skx-ip4-02
-      - 9   # rls2009 NDRPDR cov 3n-skx-ip4-03
-      - 10  # rls2009 NDRPDR cov 3n-skx-ip4-04
-      - 38  # rls2009 NDRPDR cov 3n-skx-ip4-05
-      - 12  # rls2009 NDRPDR cov 3n-skx-ip4-06
-      - 39  # rls2009 NDRPDR cov 3n-skx-ip4-07
-      - 14  # rls2009 NDRPDR cov 3n-skx-ip4tun-00
-      - 15  # rls2009 NDRPDR cov 3n-skx-ip4tun-01
-      - 16  # rls2009 NDRPDR cov 3n-skx-ip4tun-02
-      - 40  # rls2009 NDRPDR cov 3n-skx-ip6-00
-      - 18  # rls2009 NDRPDR cov 3n-skx-ip6-01
-      - 19  # rls2009 NDRPDR cov 3n-skx-ip6tun-00
-      - 20  # rls2009 NDRPDR cov 3n-skx-l2-00
-      - 21  # rls2009 NDRPDR cov 3n-skx-l2-01
-      - 22  # rls2009 NDRPDR cov 3n-skx-l2-02
-      - 23  # rls2009 NDRPDR cov 3n-skx-l2-03
-      - 24  # rls2009 NDRPDR cov 3n-skx-l2-04
-      - 41  # rls2009 NDRPDR cov 3n-skx-l2-05
-      - 42  # rls2009 NDRPDR cov 3n-skx-l2-06
-      - 43  # rls2009 NDRPDR cov 3n-skx-l2-07
-      - 28  # rls2009 NDRPDR cov 3n-skx-l2-08
-      - 44  # rls2009 NDRPDR cov 3n-skx-l2-09
-      - 45  # rls2009 NDRPDR cov 3n-skx-l2-10
-      - 46  # rls2009 NDRPDR cov 3n-skx-memif-00
-      - 47  # rls2009 NDRPDR cov 3n-skx-srv6-00
-      - 48  # rls2009 NDRPDR cov 3n-skx-srv6-01
-      - 49  # rls2009 NDRPDR cov 3n-skx-vhost-00
-      - 50  # rls2009 NDRPDR cov 3n-skx-vhost-01
-      - 51  # rls2009 NDRPDR cov 3n-skx-vhost-02
-      - 54  # rls2009 NDRPDR cov 3n-skx-vhost-03
-
-    csit-vpp-perf-verify-2001-2n-skx:
-      - 101  # MRR sel - old
-      - 128  # MRR sel addition - old
-    csit-vpp-perf-report-iterative-2005-2n-skx:
-      - 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
-      - 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
-      - 99  # MRR sel env 4
+    csit-vpp-perf-report-iterative-2101-3n-skx:
+      - 34  # rls2009 MRR iter env 6
+      - 14  # rls2009 NDRPDR iter env 6
+      - 15  # rls2009 NDRPDR iter env 6
+      - 16  # rls2009 NDRPDR iter env 6
+      - 17  # rls2009 NDRPDR iter env 6
+      - 18  # rls2009 NDRPDR iter env 6
+      - 25  # rls2009 NDRPDR iter env 6
+      - 26  # rls2009 NDRPDR iter env 6
+      - 27  # rls2009 NDRPDR iter env 6
+      - 29  # rls2009 NDRPDR iter env 6
+      - 31  # rls2009 NDRPDR iter env 6
+      - 35  # rls2101.rel MRR iter env 6
+      - 36  # rls2101.rel NDRPDR iter env 6
+      - 37  # rls2101.rel NDRPDR iter env 6
+      - 38  # rls2101.rel NDRPDR iter env 6
+      - 39  # rls2101.rel NDRPDR iter env 6
+      - 40  # rls2101.rel NDRPDR iter env 6
+      - 41  # rls2101.rel NDRPDR iter env 6
+      - 42  # rls2101.rel NDRPDR iter env 6
+      - 47  # rls2101.rel NDRPDR iter env 6
+      - 48  # rls2101.rel NDRPDR iter env 6
+      - 50  # rls2101.rel NDRPDR iter env 6
+    csit-vpp-perf-report-coverage-2101-3n-skx:
+      - 1   # rls2101.rel NDRPDR cov env 6 3n-skx-crypto-00
+      - 2   # rls2101.rel NDRPDR cov env 6 3n-skx-crypto-01
+      - 3   # rls2101.rel NDRPDR cov env 6 3n-skx-crypto-02
+#       - 4   # rls2101.rel NDRPDR cov env 6 3n-skx-crypto-03
+      - 5   # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-00
+      - 16  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-01
+      - 7   # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-02
+#       - 17  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-03
+      - 18  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-04
+#       - 19  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-05
+      - 20  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-06
+      - 12  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4-06
+      - 13  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4tun-00
+      - 26  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4tun-01
+      - 15  # rls2101.rel NDRPDR cov env 6 3n-skx-ip4tun-02
+      - 21  # rls2101.rel NDRPDR cov env 6 3n-skx-ip6-00
+      - 22  # rls2101.rel NDRPDR cov env 6 3n-skx-ip6-01
+      - 23  # rls2101.rel NDRPDR cov env 6 3n-skx-ip6tun-00
+      - 24  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-00
+      - 30  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-01
+      - 27  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-02
+      - 28  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-03
+      - 29  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-04
+#       - 31  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-05
+      - 32  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-06
+      - 33  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-07
+      - 34  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-08
+      - 35  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-09
+      - 36  # rls2101.rel NDRPDR cov env 6 3n-skx-l2-10
+      - 37  # rls2101.rel NDRPDR cov env 6 3n-skx-memif-00
+      - 38  # rls2101.rel NDRPDR cov env 6 3n-skx-srv6-00
+      - 39  # rls2101.rel NDRPDR cov env 6 3n-skx-srv6-01
+#       - 40  # rls2101.rel NDRPDR cov env 6 3n-skx-vhost-00
+#       - 41  # rls2101.rel NDRPDR cov env 6 3n-skx-vhost-01
+      - 42  # rls2101.rel NDRPDR cov env 6 3n-skx-vhost-02
+      - 43  # rls2101.rel NDRPDR cov env 6 3n-skx-vhost-03
+
     csit-vpp-perf-report-iterative-2009-2n-skx:
       - 20  # rls2005 MRR iter env 5
       - 13  # rls2005 NDRPDR iter env 5
       - 118 # rls2009 NDRPDR iter NAT44 env 5
       - 119 # rls2009 NDRPDR iter NAT44 env 5
       - 121 # rls2009 NDRPDR iter NAT44 env 5
-      - 38  # rls2009 nf-density iter env 5
-      - 41  # rls2009 nf-density iter env 5
-      - 45  # rls2009 nf-density iter env 5
-      - 47  # rls2009 nf-density iter env 5
-      - 49  # rls2009 nf-density iter env 5
-      - 63  # rls2009 nf-density iter env 5
-      - 65  # rls2009 nf-density iter env 5
-      - 66  # rls2009 nf-density iter env 5
-      - 71  # rls2009 nf-density iter env 5
-      - 72  # rls2009 nf-density iter env 5
-      - 50  # rls2009 MRR nf-density iter env 5
-      - 27  # rls2009 reconf env 5
-      - 28  # rls2009 reconf env 5
-      - 29  # rls2009 reconf env 5
-      - 30  # rls2009 reconf env 5
-      - 31  # rls2009 reconf env 5
-      - 32  # rls2009 reconf env 5
-      - 61  # rls2009 reconf env 5
-      - 62  # rls2009 reconf env 5
-      - 68  # rls2009 reconf env 5
-      - 70  # rls2009 reconf env 5
-      - 33  # rls2009 soak env 5
-      - 34  # rls2009 soak env 5
-    csit-vpp-perf-report-coverage-2009-2n-skx:
-      - 18  # rls2009 NDRPDR cov 2n-skx-ip4-00
-      - 19  # rls2009 NDRPDR cov 2n-skx-ip4-01
-      - 10  # rls2009 NDRPDR cov 2n-skx-ip4-02
-      - 20  # rls2009 NDRPDR cov 2n-skx-ip4-03
-      - 21  # rls2009 NDRPDR cov 2n-skx-ip4-04
-      - 31  # rls2009 NDRPDR cov 2n-skx-ip4-05
-      - 32  # rls2009 NDRPDR cov 2n-skx-ip4-06
-      - 33  # rls2009 NDRPDR cov 2n-skx-ip4-07
-      - 22  # rls2009 NDRPDR cov 2n-skx-ip6-00
-      - 23  # rls2009 NDRPDR cov 2n-skx-ip6-01
-      - 24  # rls2009 NDRPDR cov 2n-skx-l2-00
-      - 25  # rls2009 NDRPDR cov 2n-skx-l2-01
-      - 26  # rls2009 NDRPDR cov 2n-skx-lb-00
-      - 27  # rls2009 NDRPDR cov 2n-skx-memif-00
-      - 28  # rls2009 NDRPDR cov 2n-skx-vhost-00
-      - 29  # rls2009 NDRPDR cov 2n-skx-vhost-01
-      - 30  # rls2009 NDRPDR cov 2n-skx-vts-00
-
-    csit-vpp-perf-verify-2001-2n-clx:
-      - 39  # MRR
-    csit-vpp-perf-report-iterative-2005-2n-clx:
-      - 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
-      - 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
-      - 72  # MRR env 4
+    csit-vpp-perf-report-iterative-2101-2n-skx:
+      - 21  # rls2009 MRR iter env 6
+      - 22  # rls2009 NDRPDR iter env 6
+      - 23  # rls2009 NDRPDR iter env 6
+      - 24  # rls2009 NDRPDR iter env 6
+      - 25  # rls2009 NDRPDR iter env 6
+      - 26  # rls2009 NDRPDR iter env 6
+      - 28  # rls2009 NDRPDR iter env 6
+      - 39  # rls2009 NDRPDR iter env 6
+      - 40  # rls2009 NDRPDR iter env 6
+      - 41  # rls2009 NDRPDR iter env 6
+      - 44  # rls2009 NDRPDR iter env 6
+      - 62  # rls2101.rel MRR iter env 6
+      - 63  # rls2101.rel NDRPDR iter env 6
+      - 69  # rls2101.rel NDRPDR iter env 6
+      - 70  # rls2101.rel NDRPDR iter env 6
+      - 75  # rls2101.rel NDRPDR iter env 6
+      - 76  # rls2101.rel NDRPDR iter env 6
+      - 77  # rls2101.rel NDRPDR iter env 6
+      - 82  # rls2101.rel NDRPDR iter env 6
+      - 85  # rls2101.rel NDRPDR iter env 6
+      - 86  # rls2101.rel NDRPDR iter env 6
+      - 94  # rls2101.rel NDRPDR iter env 6
+      - 89  # rls2101.rel NDRPDR iter RND env 6
+      - 90  # rls2101.rel NDRPDR iter RND env 6
+      - 91  # rls2101.rel NDRPDR iter RND env 6
+      - 92  # rls2101.rel NDRPDR iter RND env 6
+      - 93  # rls2101.rel NDRPDR iter RND env 6
+      - 96  # rls2101.rel NDRPDR iter RND env 6
+      - 98  # rls2101.rel NDRPDR iter RND env 6
+      - 99  # rls2101.rel NDRPDR iter RND env 6
+      - 101 # rls2101.rel NDRPDR iter RND env 6
+      - 102 # rls2101.rel NDRPDR iter RND env 6
+      - 116 # rls2101.rel NDRPDR iter NAT env 6
+      - 117 # rls2101.rel NDRPDR iter NAT env 6
+      - 118 # rls2101.rel NDRPDR iter NAT env 6
+      - 119 # rls2101.rel NDRPDR iter NAT env 6
+      - 120 # rls2101.rel NDRPDR iter NAT env 6
+      - 121 # rls2101.rel NDRPDR iter NAT env 6
+      - 122 # rls2101.rel NDRPDR iter NAT env 6
+      - 123 # rls2101.rel NDRPDR iter NAT env 6
+      - 124 # rls2101.rel NDRPDR iter NAT env 6
+      - 125 # rls2101.rel NDRPDR iter NAT env 6
+      - 65  # rls2101.rel MRR nf-density iter env 6
+      - 67  # rls2101.rel NDRPDR nf-density iter env 6
+      - 72  # rls2101.rel NDRPDR nf-density iter env 6
+      - 79  # rls2101.rel NDRPDR nf-density iter env 6
+      - 83  # rls2101.rel NDRPDR nf-density iter env 6
+      - 88  # rls2101.rel NDRPDR nf-density iter env 6
+      - 97  # rls2101.rel NDRPDR nf-density iter env 6
+      - 103 # rls2101.rel NDRPDR nf-density iter env 6
+      - 108 # rls2101.rel NDRPDR nf-density iter env 6
+      - 109 # rls2101.rel NDRPDR nf-density iter env 6
+      - 110 # rls2101.rel NDRPDR nf-density iter env 6
+      - 64  # rls2101.rel NDRPDR reconf iter env 6
+      - 66  # rls2101.rel NDRPDR reconf iter env 6
+      - 71  # rls2101.rel NDRPDR reconf iter env 6
+      - 74  # rls2101.rel NDRPDR reconf iter env 6
+      - 78  # rls2101.rel NDRPDR reconf iter env 6
+      - 87  # rls2101.rel NDRPDR reconf iter env 6
+      - 95  # rls2101.rel NDRPDR reconf iter env 6
+      - 100 # rls2101.rel NDRPDR reconf iter env 6
+      - 104 # rls2101.rel NDRPDR reconf iter env 6
+      - 106 # rls2101.rel NDRPDR reconf iter env 6
+      - 68  # rls2101.rel soak env 6
+      - 73  # rls2101.rel soak env 6
+    csit-vpp-perf-report-coverage-2101-2n-skx:
+      - 1   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-00
+      - 2   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-01
+      - 3   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-02
+      - 4   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-03
+      - 5   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-04
+      - 6   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-05
+      - 7   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-06
+      - 8   # rls2101.rel NDRPDR cov env 6 2n-skx-ip4-07
+      - 21  # rls2101.rel NDRPDR cov env 6 2n-skx-ip4tun-00
+      - 22  # rls2101.rel NDRPDR cov env 6 2n-skx-ip4tun-00
+      - 10  # rls2101.rel NDRPDR cov env 6 2n-skx-ip6-00
+      - 11  # rls2101.rel NDRPDR cov env 6 2n-skx-ip6-01
+      - 12  # rls2101.rel NDRPDR cov env 6 2n-skx-l2-00
+      - 13  # rls2101.rel NDRPDR cov env 6 2n-skx-l2-01
+      - 14  # rls2101.rel NDRPDR cov env 6 2n-skx-lb-00
+      - 15  # rls2101.rel NDRPDR cov env 6 2n-skx-memif-00
+      - 16  # rls2101.rel NDRPDR cov env 6 2n-skx-vhost-00
+      - 17  # rls2101.rel NDRPDR cov env 6 2n-skx-vhost-01
+      - 19  # rls2101.rel NDRPDR cov env 6 2n-skx-vts-00
+
     csit-vpp-perf-report-iterative-2009-2n-clx:
       - 77  # rls2005 MRR iter env 5
       - 13  # rls2005 NDRPDR iter env 5
       - 122 # rls2009 NDRPDR iter NAT44 env 5
       - 123 # rls2009 NDRPDR iter NAT44 env 5
       - 126 # rls2009 NDRPDR iter NAT44 env 5
-      - 37  # rls2009 nf-density iter env 5
-      - 43  # rls2009 nf-density iter env 5
-      - 69  # rls2009 nf-density iter env 5
-      - 70  # rls2009 nf-density iter env 5
-      - 71  # rls2009 nf-density iter env 5
-      - 72  # rls2009 nf-density iter env 5
-      - 73  # rls2009 nf-density iter env 5
-      - 74  # rls2009 nf-density iter env 5
-      - 75  # rls2009 nf-density iter env 5
-      - 76  # rls2009 nf-density iter env 5
-      - 45  # rls2009 MRR nf-density iter env 5
-      - 25  # rls2009 reconf env 5
-      - 27  # rls2009 reconf env 5
-      - 28  # rls2009 reconf env 5
-      - 29  # rls2009 reconf env 5
-      - 30  # rls2009 reconf env 5
-      - 30  # rls2009 reconf env 5
-      - 32  # rls2009 reconf env 5
-      - 48  # rls2009 reconf env 5
-      - 53  # rls2009 reconf env 5
-      - 68  # rls2009 reconf env 5
-      - 33  # rls2009 soak env 5
-      - 34  # rls2009 soak env 5
-    csit-vpp-perf-report-coverage-2009-2n-clx:
-      - 2   # rls2009 NDRPDR cov 2n-clx-ip4-00
-      - 3   # rls2009 NDRPDR cov 2n-clx-ip4-01
-      - 4   # rls2009 NDRPDR cov 2n-clx-ip4-02
-      - 5   # rls2009 NDRPDR cov 2n-clx-ip4-03
-      - 6   # rls2009 NDRPDR cov 2n-clx-ip4-04
-      - 23  # rls2009 NDRPDR cov 2n-clx-ip4-05
-      - 24  # rls2009 NDRPDR cov 2n-clx-ip4-06
-      - 25  # rls2009 NDRPDR cov 2n-clx-ip4-07
-      - 22  # rls2009 NDRPDR cov 2n-clx-ip6-00
-      - 9   # rls2009 NDRPDR cov 2n-clx-ip6-01
-      - 17  # rls2009 NDRPDR cov 2n-clx-l2-00
-      - 21  # rls2009 NDRPDR cov 2n-clx-l2-01
-      - 12  # rls2009 NDRPDR cov 2n-clx-lb-00
-      - 13  # rls2009 NDRPDR cov 2n-clx-memif-00
-      - 14  # rls2009 NDRPDR cov 2n-clx-vhost-00
-      - 15  # rls2009 NDRPDR cov 2n-clx-vhost-01
-      - 16  # rls2009 NDRPDR cov 2n-clx-vts-00
+    csit-vpp-perf-report-iterative-2101-2n-clx:
+      - 15  # rls2009 MRR iter env 6
+      - 16  # rls2009 NDRPDR iter env 6
+      - 17  # rls2009 NDRPDR iter env 6
+      - 18  # rls2009 NDRPDR iter env 6
+      - 19  # rls2009 NDRPDR iter env 6
+      - 20  # rls2009 NDRPDR iter env 6
+      - 21  # rls2009 NDRPDR iter env 6
+      - 32  # rls2009 NDRPDR iter env 6
+      - 33  # rls2009 NDRPDR iter env 6
+      - 34  # rls2009 NDRPDR iter env 6
+      - 35  # rls2009 NDRPDR iter env 6
+      - 53  # rls2101.rel MRR iter env 6
+      - 54  # rls2101.rel NDRPDR iter env 6
+      - 59  # rls2101.rel NDRPDR iter env 6
+      - 60  # rls2101.rel NDRPDR iter env 6
+      - 63  # rls2101.rel NDRPDR iter env 6
+      - 66  # rls2101.rel NDRPDR iter env 6
+      - 68  # rls2101.rel NDRPDR iter env 6
+      - 73  # rls2101.rel NDRPDR iter env 6
+      - 75  # rls2101.rel NDRPDR iter env 6
+      - 86  # rls2101.rel NDRPDR iter env 6
+      - 90  # rls2101.rel NDRPDR iter env 6
+      - 80  # rls2101.rel NDRPDR iter RND env 6
+      - 87  # rls2101.rel NDRPDR iter RND env 6
+      - 91  # rls2101.rel NDRPDR iter RND env 6
+      - 92  # rls2101.rel NDRPDR iter RND env 6
+      - 93  # rls2101.rel NDRPDR iter RND env 6
+      - 94  # rls2101.rel NDRPDR iter RND env 6
+      - 95  # rls2101.rel NDRPDR iter RND env 6
+      - 100 # rls2101.rel NDRPDR iter RND env 6
+      - 106 # rls2101.rel NDRPDR iter RND env 6
+      - 108 # rls2101.rel NDRPDR iter RND env 6
+      - 112 # rls2101.rel NDRPDR iter NAT env 6
+      - 113 # rls2101.rel NDRPDR iter NAT env 6
+      - 114 # rls2101.rel NDRPDR iter NAT env 6
+      - 115 # rls2101.rel NDRPDR iter NAT env 6
+      - 116 # rls2101.rel NDRPDR iter NAT env 6
+      - 117 # rls2101.rel NDRPDR iter NAT env 6
+      - 118 # rls2101.rel NDRPDR iter NAT env 6
+      - 119 # rls2101.rel NDRPDR iter NAT env 6
+      - 120 # rls2101.rel NDRPDR iter NAT env 6
+      - 121 # rls2101.rel NDRPDR iter NAT env 6
+      - 72  # rls2101.rel MRR nf-density iter env 6
+      - 57  # rls2101.rel NDRPDR nf-density iter env 6
+      - 62  # rls2101.rel NDRPDR nf-density iter env 6
+      - 70  # rls2101.rel NDRPDR nf-density iter env 6
+      - 71  # rls2101.rel NDRPDR nf-density iter env 6
+      - 82  # rls2101.rel NDRPDR nf-density iter env 6
+      - 88  # rls2101.rel NDRPDR nf-density iter env 6
+      - 89  # rls2101.rel NDRPDR nf-density iter env 6
+      - 96  # rls2101.rel NDRPDR nf-density iter env 6
+      - 97  # rls2101.rel NDRPDR nf-density iter env 6
+      - 98  # rls2101.rel NDRPDR nf-density iter env 6
+      - 55  # rls2101.rel NDRPDR reconf iter env 6
+      - 64  # rls2101.rel NDRPDR reconf iter env 6
+      - 76  # rls2101.rel NDRPDR reconf iter env 6
+      - 83  # rls2101.rel NDRPDR reconf iter env 6
+      - 99  # rls2101.rel NDRPDR reconf iter env 6
+      - 101 # rls2101.rel NDRPDR reconf iter env 6
+      - 102 # rls2101.rel NDRPDR reconf iter env 6
+      - 107 # rls2101.rel NDRPDR reconf iter env 6
+      - 109 # rls2101.rel NDRPDR reconf iter env 6
+      - 110 # rls2101.rel NDRPDR reconf iter env 6
+      - 58  # rls2101.rel soak env 6
+      - 61  # rls2101.rel soak env 6
+    csit-vpp-perf-report-coverage-2101-2n-clx:
+      - 1   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-00
+      - 2   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-01
+      - 3   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-02
+      - 4   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-03
+      - 5   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-04
+      - 6   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-05
+      - 7   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-06
+      - 8   # rls2101.rel NDRPDR cov env 6 2n-clx-ip4-07
+      - 19  # rls2101.rel NDRPDR cov env 6 2n-clx-ip4tun-00
+      - 20  # rls2101.rel NDRPDR cov env 6 2n-clx-ip4tun-00
+      - 10  # rls2101.rel NDRPDR cov env 6 2n-clx-ip6-00
+      - 11  # rls2101.rel NDRPDR cov env 6 2n-clx-ip6-01
+      - 12  # rls2101.rel NDRPDR cov env 6 2n-clx-l2-00
+      - 13  # rls2101.rel NDRPDR cov env 6 2n-clx-l2-01
+      - 14  # rls2101.rel NDRPDR cov env 6 2n-clx-lb-00
+      - 15  # rls2101.rel NDRPDR cov env 6 2n-clx-memif-00
+      - 16  # rls2101.rel NDRPDR cov env 6 2n-clx-vhost-00
+      - 17  # rls2101.rel NDRPDR cov env 6 2n-clx-vhost-01
+      - 18  # rls2101.rel NDRPDR cov env 6 2n-clx-vts-00
 
     csit-vpp-perf-report-iterative-2009-2n-zn2:
-      - 1   # rls2009 MRR iter env 5
-      - 3   # rls2009 NDRPDR iter env 5
-      - 4   # rls2009 NDRPDR iter env 5
-      - 6   # rls2009 NDRPDR iter env 5
-      - 7   # rls2009 NDRPDR iter env 5
-      - 8   # rls2009 NDRPDR iter env 5
+      - 15  # rls2009 MRR iter env 5
+      - 17  # rls2009 NDRPDR iter env 5
+      - 18  # rls2009 NDRPDR iter env 5
+      - 31  # rls2009 NDRPDR iter env 5
+      - 33  # rls2009 NDRPDR iter env 5
+      - 34  # rls2009 NDRPDR iter env 5
+    csit-vpp-perf-report-iterative-2101-2n-zn2:
+      - 8   # rls2009 MRR iter env6
+      - 9   # rls2009 NDRPDR iter env 6
+      - 10  # rls2009 NDRPDR iter env 6
+      - 11  # rls2009 NDRPDR iter env 6
+      - 12  # rls2009 NDRPDR iter env 6
+      - 13  # rls2009 NDRPDR iter env 6
+      - 20  # rls2009 NDRPDR iter env 6
+      - 21  # rls2009 NDRPDR iter env 6
+      - 22  # rls2009 NDRPDR iter env 6
+      - 25  # rls2009 NDRPDR iter env 6
+      - 26  # rls2009 NDRPDR iter env 6
+      - 30  # rls2101.rel MRR iter env 6
+      - 31  # rls2101.rel NDRPDR iter env 6
+      - 32  # rls2101.rel NDRPDR iter env 6
+      - 33  # rls2101.rel NDRPDR iter env 6
+      - 34  # rls2101.rel NDRPDR iter env 6
+      - 35  # rls2101.rel NDRPDR iter env 6
+      - 36  # rls2101.rel NDRPDR iter env 6
+      - 37  # rls2101.rel NDRPDR iter env 6
+      - 38  # rls2101.rel NDRPDR iter env 6
+      - 44  # rls2101.rel NDRPDR iter env 6
+      - 49  # rls2101.rel NDRPDR iter env 6
+      - 39  # rls2101.rel NDRPDR iter RND env 6
+      - 40  # rls2101.rel NDRPDR iter RND env 6
+      - 41  # rls2101.rel NDRPDR iter RND env 6
+      - 42  # rls2101.rel NDRPDR iter RND env 6
+      - 43  # rls2101.rel NDRPDR iter RND env 6
+      - 45  # rls2101.rel NDRPDR iter RND env 6
+      - 48  # rls2101.rel NDRPDR iter RND env 6
+      - 50  # rls2101.rel NDRPDR iter RND env 6
+      - 51  # rls2101.rel NDRPDR iter RND env 6
+      - 52  # rls2101.rel NDRPDR iter RND env 6
 
-    csit-vpp-perf-verify-2001-3n-tsh:
-      - 9   # MRR sel
-    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
-      - 28  # NDRPDR sel 2001.0-4
-      - 29  # NDRPDR sel 2001.0-4
-      - 31  # NDRPDR sel 2001.0-4
-      - 27  # MRR sel env 4
     csit-vpp-perf-report-iterative-2009-3n-tsh:
       - 8   # rls2005 NDRPDR iter env 5
       - 11  # rls2005 NDRPDR iter env 5
       - 38  # rls2009 NDRPDR iter env 5
       - 41  # rls2009 NDRPDR iter env 5
       - 15  # rls2009 MRR iter env 5
+    csit-vpp-perf-report-iterative-2101-3n-tsh:
+      - 7   # rls2009 MRR iter env 6
+      - 8   # rls2009 NDRPDR iter env 6
+      - 13  # rls2009 NDRPDR iter env 6
+      - 14  # rls2009 NDRPDR iter env 6
+      - 15  # rls2009 NDRPDR iter env 6
+      - 16  # rls2009 NDRPDR iter env 6
+      - 17  # rls2009 NDRPDR iter env 6
+      - 18  # rls2009 NDRPDR iter env 6
+      - 19  # rls2009 NDRPDR iter env 6
+      - 21  # rls2009 NDRPDR iter env 6
+      - 22  # rls2101.rel MRR iter env 6
+      - 23  # rls2101.rel NDRPDR iter env 6
+      - 24  # rls2101.rel NDRPDR iter env 6
+      - 25  # rls2101.rel NDRPDR iter env 6
+      - 26  # rls2101.rel NDRPDR iter env 6
+      - 27  # rls2101.rel NDRPDR iter env 6
+      - 28  # rls2101.rel NDRPDR iter env 6
+      - 29  # rls2101.rel NDRPDR iter env 6
+      - 30  # rls2101.rel NDRPDR iter env 6
+      - 31  # rls2101.rel NDRPDR iter env 6
+      - 32  # rls2101.rel NDRPDR iter env 6
+
+    csit-vpp-perf-report-iterative-2101-2n-tx2:
+      - 5   # rls2009 MRR iter env 6
+      - 6   # rls2009 NDRPDR iter env 6
+      - 7   # rls2009 NDRPDR iter env 6
+      - 11  # rls2009 NDRPDR iter env 6
+      - 12  # rls2009 NDRPDR iter env 6
+      - 13  # rls2009 NDRPDR iter env 6
+      - 16  # rls2009 NDRPDR iter env 6
+      - 17  # rls2009 NDRPDR iter env 6
+      - 18  # rls2009 NDRPDR iter env 6
+      - 19  # rls2009 NDRPDR iter env 6
+      - 20  # rls2009 NDRPDR iter env 6
+      - 21  # rls2101.rel MRR iter env 6
+      - 22  # rls2101.rel NDRPDR iter env 6
+      - 23  # rls2101.rel NDRPDR iter env 6
+      - 24  # rls2101.rel NDRPDR iter env 6
+      - 25  # rls2101.rel NDRPDR iter env 6
+      - 26  # rls2101.rel NDRPDR iter env 6
+      - 27  # rls2101.rel NDRPDR iter env 6
+      - 28  # rls2101.rel NDRPDR iter env 6
+      - 29  # rls2101.rel NDRPDR iter env 6
+      - 30  # rls2101.rel NDRPDR iter env 6
+      - 31  # rls2101.rel NDRPDR iter env 6
+    csit-vpp-perf-report-coverage-2101-2n-tx2:
+      - 1   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-00
+      - 2   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-01
+      - 3   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-02
+      - 4   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-03
+      - 5   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-04
+      - 6   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-05
+      - 7   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip4-06
+      - 8   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip6-00
+      - 9   # rls2101.rel NDRPDR cov env 6 2n-tx2-ip6-01
+      - 10  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-00
+      - 11  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-01
+      - 12  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-02
+      - 13  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-03
+      - 15  # rls2101.rel NDRPDR cov env 6 2n-tx2-l2-04
 
-    csit-vpp-perf-verify-2001-3n-dnv:
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 11  # MRR sel
     csit-vpp-perf-report-iterative-2009-3n-dnv:
       - 16  # rls2005 NDRPDR iter env 5
       - 23  # rls2005 NDRPDR iter env 5
       - 15  # rls2009 NDRPDR iter env 5
       - 24  # rls2009 NDRPDR iter env 5
       - 22  # rls2009 MRR iter env 5
-    csit-vpp-perf-report-coverage-2009-3n-dnv:
-      - 10  # rls2009 NDRPDR cov 3n-dnv-crypto-00
-      - 2   # rls2009 NDRPDR cov 3n-dnv-crypto-01
-      - 11  # rls2009 NDRPDR cov 3n-dnv-ip4-00
-      - 12  # rls2009 NDRPDR cov 3n-dnv-ip4-01
-      - 13  # rls2009 NDRPDR cov 3n-dnv-ip4tun-00
-      - 14  # rls2009 NDRPDR cov 3n-dnv-ip6-00
-      - 15  # rls2009 NDRPDR cov 3n-dnv-ip6-01
-      - 16  # rls2009 NDRPDR cov 3n-dnv-l2-00
-      - 17  # rls2009 NDRPDR cov 3n-dnv-l2-01
-
-    csit-vpp-perf-verify-2001-2n-dnv:
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 12  # MRR sel
+    csit-vpp-perf-report-iterative-2101-3n-dnv:
+      - 32  # rls2101.rel MRR iter env 6
+      - 33  # rls2101.rel NDRPDR iter env 6
+      - 34  # rls2101.rel NDRPDR iter env 6
+      - 35  # rls2101.rel NDRPDR iter env 6
+      - 36  # rls2101.rel NDRPDR iter env 6
+      - 37  # rls2101.rel NDRPDR iter env 6
+      - 38  # rls2101.rel NDRPDR iter env 6
+      - 39  # rls2101.rel NDRPDR iter env 6
+      - 40  # rls2101.rel NDRPDR iter env 6
+      - 41  # rls2101.rel NDRPDR iter env 6
+      - 42  # rls2101.rel NDRPDR iter env 6
+      - 43  # rls2101.rel NDRPDR iter RND env 6
+      - 44  # rls2101.rel NDRPDR iter RND env 6
+      - 45  # rls2101.rel NDRPDR iter RND env 6
+      - 46  # rls2101.rel NDRPDR iter RND env 6
+      - 47  # rls2101.rel NDRPDR iter RND env 6
+      - 48  # rls2101.rel NDRPDR iter RND env 6
+      - 49  # rls2101.rel NDRPDR iter RND env 6
+      - 50  # rls2101.rel NDRPDR iter RND env 6
+      - 51  # rls2101.rel NDRPDR iter RND env 6
+      - 52  # rls2101.rel NDRPDR iter RND env 6
+    csit-vpp-perf-report-coverage-2101-3n-dnv:
+      - 1   # rls2101.rel NDRPDR cov env 6 3n-dnv-crypto-00
+      - 2   # rls2101.rel NDRPDR cov env 6 3n-dnv-crypto-01
+      - 3   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4-00
+      - 4   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4-01
+      - 5   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4tun-00
+      - 6   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip6-00
+      - 7   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip6-01
+      - 8   # rls2101.rel NDRPDR cov env 6 3n-dnv-l2-00
+      - 9   # rls2101.rel NDRPDR cov env 6 3n-dnv-l2-01
+
     csit-vpp-perf-report-iterative-2009-2n-dnv:
       - 16  # rls2005 NDRPDR iter env 5
       - 17  # rls2005 NDRPDR iter env 5
       - 14  # rls2009 NDRPDR iter env 5
       - 15  # rls2009 NDRPDR iter env 5
       - 13  # rls2009 MRR iter env 5
-    csit-vpp-perf-report-coverage-2009-2n-dnv:
-      - 2   # rls2009 NDRPDR cov 2n-dnv-ip4-00
-      - 3   # rls2009 NDRPDR cov 2n-dnv-ip4-01
-      - 4   # rls2009 NDRPDR cov 2n-dnv-ip6-00
-      - 5   # rls2009 NDRPDR cov 2n-dnv-ip6-01
-      - 6   # rls2009 NDRPDR cov 2n-dnv-l2-00
-      - 7   # rls2009 NDRPDR cov 2n-dnv-l2-01
-
-    csit-dpdk-perf-verify-2001-3n-hsw:
-      - 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
-      - 13  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
+    csit-vpp-perf-report-iterative-2101-2n-dnv:
+      - 31  # rls2101.rel MRR iter env 6
+      - 32  # rls2101.rel NDRPDR iter env 6
+      - 33  # rls2101.rel NDRPDR iter env 6
+      - 34  # rls2101.rel NDRPDR iter env 6
+      - 35  # rls2101.rel NDRPDR iter env 6
+      - 39  # rls2101.rel NDRPDR iter env 6
+      - 41  # rls2101.rel NDRPDR iter env 6
+      - 42  # rls2101.rel NDRPDR iter env 6
+      - 43  # rls2101.rel NDRPDR iter env 6
+      - 44  # rls2101.rel NDRPDR iter env 6
+      - 45  # rls2101.rel NDRPDR iter env 6
+      - 46  # rls2101.rel NDRPDR iter RND env 6
+      - 47  # rls2101.rel NDRPDR iter RND env 6
+      - 48  # rls2101.rel NDRPDR iter RND env 6
+      - 49  # rls2101.rel NDRPDR iter RND env 6
+      - 50  # rls2101.rel NDRPDR iter RND env 6
+      - 51  # rls2101.rel NDRPDR iter RND env 6
+      - 52  # rls2101.rel NDRPDR iter RND env 6
+      - 53  # rls2101.rel NDRPDR iter RND env 6
+      - 54  # rls2101.rel NDRPDR iter RND env 6
+      - 55  # rls2101.rel NDRPDR iter RND env 6
+    csit-vpp-perf-report-coverage-2101-2n-dnv:
+      - 1   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4-00
+      - 2   # rls2101.rel NDRPDR cov env 6 3n-dnv-ip4-01
+      - 3   # rls2101.rel NDRPDR cov env 6 2n-dnv-ip6-00
+      - 4   # rls2101.rel NDRPDR cov env 6 2n-dnv-ip6-01
+      - 5   # rls2101.rel NDRPDR cov env 6 2n-dnv-l2-00
+      - 6   # rls2101.rel NDRPDR cov env 6 2n-dnv-l2-01
+
     csit-dpdk-perf-report-iterative-2005-3n-hsw:
       - 25  # NDRPDR iter
       - 26  # NDRPDR iter
       - 13  # NDRPDR iter env5
       - 14  # NDRPDR iter env5
       - 15  # NDRPDR iter env5
+    csit-dpdk-perf-report-iterative-2101-3n-hsw:
+      - 11  # rls2101 NDRPDR iter env 6
+      - 12  # rls2101 NDRPDR iter env 6
+      - 13  # rls2101 NDRPDR iter env 6
+      - 14  # rls2101 NDRPDR iter env 6
+      - 16  # rls2101 NDRPDR iter env 6
+      - 17  # rls2101 NDRPDR iter env 6
+      - 18  # rls2101 NDRPDR iter env 6
+      - 19  # rls2101 NDRPDR iter env 6
+      - 20  # rls2101 NDRPDR iter env 6
+      - 21  # rls2101 NDRPDR iter env 6
 
-    csit-dpdk-perf-verify-2001-3n-skx:
-      - 29  # NDRPDR sel xxv710
-      - 33  # NDRPDR sel xxv710
-      - 34  # NDRPDR sel xxv710
-      - 35  # NDRPDR sel xxv710
-      - 36  # NDRPDR sel xxv710
-      - 37  # NDRPDR sel xxv710
-      - 41  # NDRPDR sel xxv710
-      - 42  # NDRPDR sel xxv710
-      - 43  # NDRPDR sel xxv710
-      - 45  # NDRPDR sel xxv710
-      - 30  # NDRPDR sel x710
-      - 31  # NDRPDR sel x710
-      - 32  # NDRPDR sel x710
-      - 38  # NDRPDR sel x710
-      - 39  # NDRPDR sel x710
-      - 40  # NDRPDR sel x710
-      - 44  # NDRPDR sel x710
-      - 46  # NDRPDR sel x710
-      - 47  # NDRPDR sel x710
-      - 48  # NDRPDR sel x710
     csit-dpdk-perf-report-iterative-2005-3n-skx:
       - 28  # NDRPDR iter
       - 29  # NDRPDR iter
       - 11  # NDRPDR sel env5
       - 12  # NDRPDR sel env5
       - 13  # NDRPDR sel env5
+    csit-dpdk-perf-report-iterative-2101-3n-skx:
+      - 12  # rls2101 NDRPDR iter env 6
+      - 14  # rls2101 NDRPDR iter env 6
+      - 15  # rls2101 NDRPDR iter env 6
+      - 17  # rls2101 NDRPDR iter env 6
+      - 19  # rls2101 NDRPDR iter env 6
+      - 20  # rls2101 NDRPDR iter env 6
+      - 21  # rls2101 NDRPDR iter env 6
+      - 22  # rls2101 NDRPDR iter env 6
+      - 25  # rls2101 NDRPDR iter env 6
+      - 26  # rls2101 NDRPDR iter env 6
 
-    csit-dpdk-perf-verify-2001-2n-skx:
-      - 35  # NDRPDR sel xxv710
-      - 36  # NDRPDR sel xxv710
-      - 37  # NDRPDR sel xxv710
-      - 41  # NDRPDR sel xxv710
-      - 42  # NDRPDR sel xxv710
-      - 43  # NDRPDR sel xxv710
-      - 46  # NDRPDR sel xxv710
-      - 47  # NDRPDR sel xxv710
-      - 52  # NDRPDR sel xxv710
-      - 53  # NDRPDR sel xxv710
-      - 38  # NDRPDR sel x710
-      - 39  # NDRPDR sel x710
-      - 40  # NDRPDR sel x710
-      - 44  # NDRPDR sel x710
-      - 45  # NDRPDR sel x710
-      - 48  # NDRPDR sel x710
-      - 49  # NDRPDR sel x710
-      - 50  # NDRPDR sel x710
-      - 51  # NDRPDR sel x710
-      - 54  # NDRPDR sel x710
     csit-dpdk-perf-report-iterative-2005-2n-skx:
       - 20  # NDRPDR iter
       - 21  # NDRPDR iter
       - 11  # NDRPDR iter env5
       - 12  # NDRPDR iter env5
       - 13  # NDRPDR iter env5
+    csit-dpdk-perf-report-iterative-2101-2n-skx:
+      - 11  # rls2101 NDRPDR iter env 6
+      - 12  # rls2101 NDRPDR iter env 6
+      - 13  # rls2101 NDRPDR iter env 6
+      - 14  # rls2101 NDRPDR iter env 6
+      - 15  # rls2101 NDRPDR iter env 6
+      - 17  # rls2101 NDRPDR iter env 6
+      - 18  # rls2101 NDRPDR iter env 6
+      - 19  # rls2101 NDRPDR iter env 6
+      - 20  # rls2101 NDRPDR iter env 6
+      - 21  # rls2101 NDRPDR iter env 6
 
-    csit-dpdk-perf-verify-2001-2n-clx:
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 26  # NDRPDR sel
-      - 27  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 32  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 34  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-2n-clx:
       - 20  # NDRPDR iter
       - 21  # NDRPDR iter
       - 11  # NDRPDR iter env5
       - 12  # NDRPDR iter env5
       - 13  # NDRPDR iter env5
+    csit-dpdk-perf-report-iterative-2101-2n-clx:
+      - 12  # rls2101 NDRPDR iter env 6
+      - 13  # rls2101 NDRPDR iter env 6
+      - 14  # rls2101 NDRPDR iter env 6
+      - 15  # rls2101 NDRPDR iter env 6
+      - 17  # rls2101 NDRPDR iter env 6
+      - 18  # rls2101 NDRPDR iter env 6
+      - 19  # rls2101 NDRPDR iter env 6
+      - 20  # rls2101 NDRPDR iter env 6
+      - 21  # rls2101 NDRPDR iter env 6
+      - 22  # rls2101 NDRPDR iter env 6
 
     csit-dpdk-perf-report-iterative-2009-2n-zn2:
-      - 1   # NDRPDR iter env5
+      - 16  # NDRPDR iter env5
+      - 21  # NDRPDR iter env5
+      - 22  # NDRPDR iter env5
+      - 23  # NDRPDR iter env5
+      - 24  # NDRPDR iter env5
+      - 25  # NDRPDR iter env5
+      - 29  # NDRPDR iter env5
+    csit-dpdk-perf-report-iterative-2101-2n-zn2:
+      - 11  # rls2101 NDRPDR iter env 6
+      - 12  # rls2101 NDRPDR iter env 6
+      - 13  # rls2101 NDRPDR iter env 6
+      - 14  # rls2101 NDRPDR iter env 6
+      - 16  # rls2101 NDRPDR iter env 6
+      - 17  # rls2101 NDRPDR iter env 6
+      - 18  # rls2101 NDRPDR iter env 6
+      - 19  # rls2101 NDRPDR iter env 6
+      - 20  # rls2101 NDRPDR iter env 6
+      - 21  # rls2101 NDRPDR iter env 6
 
-#    csit-dpdk-perf-verify-2001-2n-dnv:
-#      - 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
-#      - 18  # NDRPDR sel
 #    csit-dpdk-perf-report-iterative-2005-2n-dnv:
 #      # No data
 #    # csit-dpdk-perf-report-iterative-2009-2n-dnv:
 #      # No data
 
-#    csit-dpdk-perf-verify-2001-3n-dnv:
-#      - 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
-#      - 22  # NDRPDR sel
 #    csit-dpdk-perf-report-iterative-2005-3n-dnv:
 #      # No data
 #    # csit-dpdk-perf-report-iterative-2009-3n-dnv:
 #      # No data
 
-    csit-dpdk-perf-verify-2001-3n-tsh:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 18  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-3n-tsh:
       - 5   # NDRPDR sel
     csit-dpdk-perf-report-iterative-2009-3n-tsh:
       - 9   # NDRPDR iter env5
       - 10  # NDRPDR iter env5
       - 11  # NDRPDR iter env5
-
-    csit-vpp-device-2009-ubuntu1804-1n-skx:
-      - 131 # rls2009 env 5
+    csit-dpdk-perf-report-iterative-2101-3n-tsh:
+      - 11  # rls2101 NDRPDR iter env 6
+      - 12  # rls2101 NDRPDR iter env 6
+      - 13  # rls2101 NDRPDR iter env 6
+      - 14  # rls2101 NDRPDR iter env 6
+      - 16  # rls2101 NDRPDR iter env 6
+      - 17  # rls2101 NDRPDR iter env 6
+      - 18  # rls2101 NDRPDR iter env 6
+      - 19  # rls2101 NDRPDR iter env 6
+      - 20  # rls2101 NDRPDR iter env 6
+      - 21  # rls2101 NDRPDR iter env 6
+
+    csit-dpdk-perf-report-iterative-2101-2n-tx2:
+      - 4   # rls2101 NDRPDR iter env 6
+      - 6   # rls2101 NDRPDR iter env 6
+      - 7   # rls2101 NDRPDR iter env 6
+      - 8   # rls2101 NDRPDR iter env 6
+      - 9   # rls2101 NDRPDR iter env 6
+      - 10  # rls2101 NDRPDR iter env 6
+      - 11  # rls2101 NDRPDR iter env 6
+      - 12  # rls2101 NDRPDR iter env 6
+      - 13  # rls2101 NDRPDR iter env 6
+      - 14  # rls2101 NDRPDR iter env 6
+
+    csit-vpp-device-2101-ubuntu1804-1n-skx:
+      - 358  # rls2101.rel VPP DEV env 6
 
 - 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env5"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env5"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env5"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-ref-env5"
+      data-set: "vpp-performance-changes-3n-hsw-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-hsw-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-ref-env5"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-skx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca2.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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-ref-env5"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-skx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca2.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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-ref-env5"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-skx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-skx-2t1c-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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-skx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-skx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-ref-env5"
+      data-set: "vpp-performance-changes-3n-skx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-skx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-skx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-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: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-ref-env5"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-skx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-skx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-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: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-ref-env5"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-skx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-skx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-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: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-ref-env5"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-skx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-skx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-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: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-skx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-ref-env5"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-skx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-skx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env5"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env5"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env5"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-2n-clx-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-2n-clx-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-ref-env5"
+      data-set: "vpp-performance-changes-2n-clx-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-clx-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-clx-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
-## VPP Performance Changes 2n-clx-x556 2t1c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-clx-x556 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-x556-2t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-2n-clx-ref-env4"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-2n-clx-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 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 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.'
-#
-## VPP Performance Changes 2n-clx-x556 4t2c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-clx-x556 4t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-x556-4t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-2n-clx-ref-env4"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-2n-clx-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 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 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.'
-#
-## VPP Performance Changes 2n-clx-x556 2t1c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-clx-x556 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-x556-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-2n-clx-ref-env4"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-2n-clx-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 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 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.'
-#
-## VPP Performance Changes 2n-clx-x556 4t2c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-clx-x556 ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-x556-4t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-2n-clx-ref-env4"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-2n-clx-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 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 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.'
+# VPP Performance Changes 2n-zn2-xxv710 2t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-zn2-xxv710 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-zn2-xxv710-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-zn2-h1"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-zn2-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-cmp"
+  comparisons:
+    - title: "2009.0-6 vs 2009.0-5"
+      reference: 1  # 2
+      compare: 2  # 3
+#      rca-file: "rca/rca-2n-zn2-2t1c-pdr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 2  # 3
+      compare: 3  # 4
+#      rca-file: "rca/rca-2n-zn2-2t1c-pdr-rca1.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-zn2-xxv710 4t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-zn2-xxv710 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-zn2-xxv710-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-zn2-h1"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-zn2-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-cmp"
+  comparisons:
+    - title: "2009.0-6 vs 2009.0-5"
+      reference: 1  # 2
+      compare: 2  # 3
+#      rca-file: "rca/rca-2n-zn2-4t2c-pdr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 2  # 3
+      compare: 3  # 4
+#      rca-file: "rca/rca-2n-zn2-4t2c-pdr-rca1.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-zn2-xxv710 2t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-zn2-xxv710 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-zn2-xxv710-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-zn2-h1"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-zn2-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-cmp"
+  comparisons:
+    - title: "2009.0-6 vs 2009.0-5"
+      reference: 1  # 2
+      compare: 2  # 3
+#      rca-file: "rca/rca-2n-zn2-2t1c-ndr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 2  # 3
+      compare: 3  # 4
+#      rca-file: "rca/rca-2n-zn2-2t1c-ndr-rca1.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-zn2-xxv710 4t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-zn2-xxv710 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-zn2-xxv710-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-zn2-h1"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-zn2-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-cmp"
+  comparisons:
+    - title: "2009.0-6 vs 2009.0-5"
+      reference: 1  # 2
+      compare: 2  # 3
+#      rca-file: "rca/rca-2n-zn2-4t2c-ndr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 2  # 3
+      compare: 3  # 4
+#      rca-file: "rca/rca-2n-zn2-4t2c-ndr-rca1.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - '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, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - '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, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-dnv-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-3n-dnv-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-dnv-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-3n-dnv-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-dnv-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-3n-dnv-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - '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, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-dnv-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-3n-dnv-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - '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, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous.'
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env5"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env5"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env5"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "2001.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-h1"
-    - title: "2005.0-4"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-ref-env5"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-tsh-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-tx2 1t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-tx2 1t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-1t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-h1"
+#     - title: "2009.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-cmp"
+  comparisons:
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-tx2 2t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-tx2 2t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-2t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-h1"
+#     - title: "2009.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-cmp"
+  comparisons:
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-tx2 1t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-tx2 1t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-1t1c-pdr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-h1"
+#     - title: "2009.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-cmp"
+  comparisons:
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-tx2 2t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-tx2 2t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-2t2c-pdr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-h1"
+#     - title: "2009.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-cmp"
+  comparisons:
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: 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: "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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-skx-2t1c-mrr-rca2.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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-4t2c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-hsw-4t2c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-skx-4t2c-mrr-rca2.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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
-      reference: 2
-      compare: 3
-#      rca-file: "rca/rca-3n-hsw-8t4c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-hsw-8t4c-mrr-rca2.yaml"
+#      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-skx-8t4c-mrr-rca2.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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-4"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
 #      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
 #      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
   legend:
     - ''
     - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
-    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
-## VPP Performance Changes 2n-clx-x556 2t1c mrr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-clx-x556 2t1c mrr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-x556-2t1c-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "2001"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
-#    - title: "2005"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - ""
-#    - "2001, 2005 - VPP versions tested."
-#    - "Diff - difference between 2001 and 2005 VPP version."
-#
-## VPP Performance Changes 2n-clx-x556 4t2c mrr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-clx-x556 4t2c mrr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-x556-4t2c-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "2001"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
-#    - title: "2005"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - ""
-#    - "2001, 2005 - VPP versions tested."
-#    - "Diff - difference between 2001 and 2005 VPP version."
-#
-## VPP Performance Changes 2n-clx-x556 8t4c mrr
-#- type: "table"
-#  title: "VPP Performance Changes 2n-clx-x556 8t4c mrr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-x556-8t4c-mrr"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'8T4C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "2001"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-ref-env4"
-#    - title: "2005"
-#      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-#  comparisons:
-#    - title: "Diff"
-#      reference: 1
-#      compare: 2
-#  legend:
-#    - ""
-#    - "2001, 2005 - VPP versions tested."
-#    - "Diff - difference between 2001 and 2005 VPP version."
+# VPP Performance Changes 2n-zn2-xxv710 2t1c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-zn2-xxv710 2t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-zn2-xxv710-2t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-zn2-mrr-h1"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-cmp"
+  comparisons:
+    - title: "2009.0-6 vs 2009.0-5"
+      reference: 1  # 2
+      compare: 2  # 3
+#      rca-file: "rca/rca-2n-zn2-2t1c-mrr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 2  # 3
+      compare: 3  # 4
+#      rca-file: "rca/rca-2n-zn2-2t1c-mrr-rca2.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-zn2-xxv710 4t2c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-zn2-xxv710 4t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-zn2-xxv710-4t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-zn2-mrr-h1"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-cmp"
+  comparisons:
+    - title: "2009.0-6 vs 2009.0-5"
+      reference: 1  # 2
+      compare: 2  # 3
+#      rca-file: "rca/rca-2n-zn2-4t2c-mrr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 2  # 3
+      compare: 3  # 4
+#      rca-file: "rca/rca-2n-zn2-4t2c-mrr-rca2.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-zn2-xxv710 8t4c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-zn2-xxv710 8t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-zn2-xxv710-8t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-zn2-mrr-h1"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-zn2-mrr-cmp"
+  comparisons:
+    - title: "2009.0-6 vs 2009.0-5"
+      reference: 1  # 2
+      compare: 2  # 3
+#      rca-file: "rca/rca-2n-zn2-8t4c-mrr-rca1.yaml"
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 2  # 3
+      compare: 3  # 4
+#      rca-file: "rca/rca-2n-zn2-8t4c-mrr-rca2.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-zn2 with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref-env-old"
+#     - title: "2009.0-6"
+#       data-set: "vpp-performance-changes-2n-dnv-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "2009.0-5 vs 2005.0-5"
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-5"
       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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - 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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca2.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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - 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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca2.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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - 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-env4"
     - title: "2005.0-5"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env5"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref-env-new"
+    - title: "2101.0-6"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "2005.0-5 vs 2005.0-4"
+    - title: "2009.0-6 vs 2009.0-5"
       reference: 2
       compare: 3
-#      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca1.yaml"
-    - title: "2009.0-5 vs 2005.0-5"
+    - title: "2101.0-6 vs 2009.0-6"
       reference: 3
       compare: 4
-#      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca2.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 CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-tx2 1t1c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-tx2 1t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-1t1c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-mrr-h1"
+#     - title: "2009.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-mrr-cmp"
+  comparisons:
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-tx2 2t2c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-tx2 2t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-2t2c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-mrr-h1"
+#     - title: "2009.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-mrr-cmp"
+  comparisons:
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
     - '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-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
-    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 2n-tx2 4t4c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-tx2 4t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-tx2-4t4c-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T4C'"
+  columns:
+#     - title: "2005.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-mrr-h1"
+#     - title: "2009.0-5"
+#       data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-old"
+    - title: "2009.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-mrr-ref-env-new"
+    - title: "2101.0-6"
+      data-set: "vpp-performance-changes-2n-tx2-mrr-cmp"
+  comparisons:
+#     - title: "2009.0-6 vs 2009.0-5"
+#       reference: 2
+#       compare: 3
+    - title: "2101.0-6 vs 2009.0-6"
+      reference: 1
+      compare: 2
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-tx2 with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "5" for CSIT rls2009, "6" for CSIT rls2101).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+#     - '2009.0-6 vs 2009.0-5: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2101.0-6 vs 2009.0-6: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
 - type: "table"
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP Performance Results 2n-tx2
+- type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-tx2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,VPP,2N,TX2]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "vpp-perf-results-2n-tx2"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Detailed Test Results - VPP Performance Results 3n-dnv
 - type: "table"
   title: "Detailed Test Results - VPP Performance Results 3n-dnv"
   - "name"
   - "conf-history"
 
+# Test configuration - VPP Performance Test Configs 2n-tx2
+- type: "table"
+  title: "Test configuration - VPP Performance Test Configs 2n-tx2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,PERF,VPP,2N,TX2]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-perf-results-2n-tx2"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Test configuration - VPP Performance Test Configs 3n-dnv
 - type: "table"
   title: "Test configuration - VPP Performance Test Configs 3n-dnv"
   data: "vpp-perf-results-3n-tsh"
   filter: "all"
 
+# Test Operational Data - VPP Performance Operational Data 2n-tx2
+- type: "table"
+  title: "Test Operational Data - VPP Performance Operational Data 2n-tx2"
+  algorithm: "table_oper_data_html"
+  output-file: "{DIR[DTO,PERF,VPP,2N,TX2]}/"
+  data: "vpp-perf-results-2n-tx2"
+  filter: "all"
+
 # Test Operational Data - VPP Performance Operational Data 3n-dnv
 - type: "table"
   title: "Test Operational Data - VPP Performance Operational Data 3n-dnv"
   - "parent"
   - "msg"
 
+# Detailed Test Results - VPP MRR Results 2n-tx2
+- type: "table"
+  title: "Detailed Test Results - VPP MRR Results 2n-tx2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,MRR,VPP,2N,TX2]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Maximum Receive Rate trial [Mpps] |preout| "
+      data: "data msg"
+  data: "vpp-mrr-results-2n-tx2"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 # Detailed Test Results - VPP MRR Results 3n-dnv
 - type: "table"
   title: "Detailed Test Results - VPP MRR Results 3n-dnv"
   - "name"
   - "conf-history"
 
+# Test configuration - VPP MRR Test Configs 2n-tx2
+- type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-tx2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTC,MRR,VPP,2N,TX2]}/"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| VPP API Test Commands History - Commands Used Per Test Case |preout| "
+      data: "data conf-history"
+  data: "vpp-mrr-results-2n-tx2"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "conf-history"
+
 # Test configuration - VPP MRR Test Configs 3n-dnv
 - type: "table"
   title: "Test configuration - VPP MRR Test Configs 3n-dnv"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 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: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
+
+# DPDK Performance Changes 2n-zn2 2t1c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-zn2 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005"
+#       data-set: "dpdk-performance-changes-2n-zn2-h1"
+    - title: "2009"
+      data-set: "dpdk-performance-changes-2n-zn2-ref"
+    - title: "2101"
+      data-set: "dpdk-performance-changes-2n-zn2-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1  # 2
+      compare: 2  # 3
+  legend:
+    - ""
+    - "2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
+
+# DPDK Performance Changes 2n-zn2 4t2c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-zn2 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005"
+#       data-set: "dpdk-performance-changes-2n-zn2-h1"
+    - title: "2009"
+      data-set: "dpdk-performance-changes-2n-zn2-ref"
+    - title: "2101"
+      data-set: "dpdk-performance-changes-2n-zn2-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1  # 2
+      compare: 2  # 3
+  legend:
+    - ""
+    - "2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
+
+# DPDK Performance Changes 2n-zn2 2t1c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-zn2 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005"
+#       data-set: "dpdk-performance-changes-2n-zn2-h1"
+    - title: "2009"
+      data-set: "dpdk-performance-changes-2n-zn2-ref"
+    - title: "2101"
+      data-set: "dpdk-performance-changes-2n-zn2-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1  # 2
+      compare: 2  # 3
+  legend:
+    - ""
+    - "2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
+
+# DPDK Performance Changes 2n-zn2 4t2c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-zn2 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-zn2-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+#     - title: "2005"
+#       data-set: "dpdk-performance-changes-2n-zn2-h1"
+    - title: "2009"
+      data-set: "dpdk-performance-changes-2n-zn2-ref"
+    - title: "2101"
+      data-set: "dpdk-performance-changes-2n-zn2-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1  # 2
+      compare: 2  # 3
+  legend:
+    - ""
+    - "2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 ## DPDK Performance Changes 2n-dnv 1t1c pdr
 #- type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2009"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2101"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - ""
-    - "2001, 2005, 2009 - DPDK versions tested."
-    - "Diff - difference between 2005 and 2009 DPDK version."
+    - "2005, 2009, 2101 - DPDK versions tested."
+    - "Diff - difference between 2009 and 2101 DPDK version."
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 - type: "table"
   - "parent"
   - "msg"
 
+# Detailed Test Results - DPDK Performance Results 2n-tx2
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-tx2"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}/dpdk_performance_results_2n_tx2"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
+  data: "dpdk-perf-results-2n-tx2"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
 ################################################################################
 ###                                F I L E S                                 ###
 ################################################################################
     - "{DIR[DTR,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTR,PERF,VPP,3N,HSW]}"
     - "{DIR[DTR,PERF,VPP,3N,TSH]}"
+    - "{DIR[DTR,PERF,VPP,2N,TX2]}"
     - "{DIR[DTR,PERF,VPP,2N,DNV]}"
     - "{DIR[DTR,PERF,VPP,3N,DNV]}"
   data:
     - "vpp-perf-results-2n-zn2"
     - "vpp-perf-results-3n-hsw"
     - "vpp-perf-results-3n-tsh"
+    - "vpp-perf-results-2n-tx2"
     - "vpp-perf-results-2n-dnv"
     - "vpp-perf-results-3n-dnv"
   filter: "all"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
+      - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
     level-3:
     - "{DIR[DTC,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTC,PERF,VPP,3N,HSW]}"
     - "{DIR[DTC,PERF,VPP,3N,TSH]}"
+    - "{DIR[DTC,PERF,VPP,2N,TX2]}"
     - "{DIR[DTC,PERF,VPP,2N,DNV]}"
     - "{DIR[DTC,PERF,VPP,3N,DNV]}"
   data:
     - "vpp-perf-results-2n-zn2"
     - "vpp-perf-results-3n-hsw"
     - "vpp-perf-results-3n-tsh"
+    - "vpp-perf-results-2n-tx2"
     - "vpp-perf-results-2n-dnv"
     - "vpp-perf-results-3n-dnv"
   filter: "all"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
+      - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
     level-3:
     - "{DIR[DTO,PERF,VPP,2N,ZN2]}"
     - "{DIR[DTO,PERF,VPP,3N,HSW]}"
     - "{DIR[DTO,PERF,VPP,3N,TSH]}"
+    - "{DIR[DTO,PERF,VPP,2N,TX2]}"
     - "{DIR[DTO,PERF,VPP,2N,DNV]}"
     - "{DIR[DTO,PERF,VPP,3N,DNV]}"
   data:
     - "vpp-perf-results-2n-zn2"
     - "vpp-perf-results-3n-hsw"
     - "vpp-perf-results-3n-tsh"
+    - "vpp-perf-results-2n-tx2"
     - "vpp-perf-results-2n-dnv"
     - "vpp-perf-results-3n-dnv"
   filter: "all"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
+      - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
     level-3:
     - "{DIR[DTR,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTR,MRR,VPP,3N,HSW]}"
     - "{DIR[DTR,MRR,VPP,3N,TSH]}"
+    - "{DIR[DTR,MRR,VPP,2N,TX2]}"
     - "{DIR[DTR,MRR,VPP,2N,DNV]}"
     - "{DIR[DTR,MRR,VPP,3N,DNV]}"
   data:
     - "vpp-mrr-results-2n-zn2"
     - "vpp-mrr-results-3n-hsw"
     - "vpp-mrr-results-3n-tsh"
+    - "vpp-mrr-results-2n-tx2"
     - "vpp-mrr-results-2n-dnv"
     - "vpp-mrr-results-3n-dnv"
   filter: "all"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
+      - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
     level-3:
     - "{DIR[DTC,MRR,VPP,2N,ZN2]}"
     - "{DIR[DTC,MRR,VPP,3N,HSW]}"
     - "{DIR[DTC,MRR,VPP,3N,TSH]}"
+    - "{DIR[DTC,MRR,VPP,2N,TX2]}"
     - "{DIR[DTC,MRR,VPP,2N,DNV]}"
     - "{DIR[DTC,MRR,VPP,3N,DNV]}"
   data:
     - "vpp-mrr-results-2n-zn2"
     - "vpp-mrr-results-3n-hsw"
     - "vpp-mrr-results-3n-tsh"
+    - "vpp-mrr-results-2n-tx2"
     - "vpp-mrr-results-2n-dnv"
     - "vpp-mrr-results-3n-dnv"
   filter: "all"
       - "2n-zn2"
       - "3n-hsw"
       - "3n-tsh"
+      - "2n-tx2"
       - "2n-dnv"
       - "3n-dnv"
     level-3:
   filter: "all"
   data-start-level: 4
 
+# DPDK Performance Results 2n-tx2
+- type: "file"
+  title: "DPDK Performance Results 2n-tx2"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,TX2]}"
+  data: "dpdk-perf-results-2n-tx2"
+  filter: "all"
+  data-start-level: 4
+
 ################################################################################
 ###                                P L O T S                                 ###
 ################################################################################
 
 ###############################################################################
 
+# Reconf tests 3n-hsw
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-1t1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec4tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-1t1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec1000tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-1t1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec60000tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-2t2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec4tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-2t2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec1000tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-2t2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec60000tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec4Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-4t4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec4tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec1000Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-4t4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec1000tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Effective Blocked Time: 3n-hsw-xl710-64b-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf"
+  algorithm: "plot_nf_reconf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-64b-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-reconf"
+  data: "plot-vpp-ipsec-reconf-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac256Sha-Reconf.64B-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Reconf.64B-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes128Gcm-Reconf.64B-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf"
+    - "Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec60000Tnlsw-1Atnl-Ip4Base-Int-Aes256Gcm-Reconf.64B-4t4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf"
+  layout:
+    title: "ethip4ipsec60000tnlsw-1atnl-ip4base"
+    layout: "plot-throughput"
+
+###############################################################################
+
 # Plots - NF Density - VSC - MRR IMIX
 - type: "plot"
   title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
     title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
   algorithm: "plot_perf_box_name"
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-ndr"
   algorithm: "plot_perf_box_name"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-rnd-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
     title: "3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-rnd-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
     title: "3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
     title: "2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf-ndr"
   algorithm: "plot_perf_box_name"
     title: "2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
   algorithm: "plot_perf_box_name"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
     title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
     title: "3n-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr"
+    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  include:
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-[avf,dpdk]-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-[avf,dpdk]-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-1t1c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-1t1c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale20K-Ndrpdr.64B-1t1c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-ip4routing-base-scale-dpdk-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-features-ip4routing-base-scale-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-features-ip4routing-base-scale-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-1t1c-ethip4-ip4base-iacldstbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-ip4routing-features-base-scale-dpdk-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-features-ip4routing-base-scale-dpdk-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-features-ip4routing-base-scale-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-1t1c-ethip4-ip4base-iacldstbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-ip4routing-features-base-scale-dpdk-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale20K-Ndrpdr.78B-1t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale200K-Ndrpdr.78B-1t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-1t1c-ethip6-ip6base-iacldstbase-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-78b-1t1c-ip4routing-base-scale-dpdk-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-1t1c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-1t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale20K-Ndrpdr.78B-1t1c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale200K-Ndrpdr.78B-1t1c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-1t1c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-1t1c-ethip6-ip6base-iacldstbase-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-l2switching-base-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-l2switching-base-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-l2switching-base-dpdk-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-l2switching-base-dpdk-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-l2switching-base-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-1t1c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-l2switching-base-dpdk-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-l2switching-scale-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-l2switching-scale-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-l2switching-scale-dpdk-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-l2switching-scale-dpdk-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
-  data: "plot-vpp-throughput-lat-tsa-3n-tsh"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-l2switching-scale-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
   include:
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr"
   layout:
-    title: "3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr"
+    title: "2n-tx2-xl710-64b-1t1c-l2switching-scale-dpdk-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-ndr"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-features-l2switching-base-dpdk-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-ndr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-features-l2switching-base-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
   include:
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-[avf,dpdk]-ndr"
+    title: "2n-tx2-xl710-64b-1t1c-features-l2switching-base-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-pdr"
+  title: "Throughput: 2n-tx2-xl710-64b-1t1c-features-l2switching-base-dpdk-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-pdr"
-  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-1t1c-features-l2switching-base-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
   include:
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2N1L-25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-avf-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Noacl-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermit-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr"
-    - "Tests.Vpp.Perf.Vts.2n1l-25Ge2P1Xxv710-Ethip4Vxlan-L2Bdbasemaclrn-Eth-Iacldstbase-Aclpermitreflect-2Vhostvr1024-1Vm-Ndrpdr.114B-2t1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-114b-2t1c-vts-l2switching-base-[avf,dpdk]-pdr"
+    title: "2n-tx2-xl710-64b-1t1c-features-l2switching-base-pdr"
     layout: "plot-throughput"
 
 ################################################################################
     title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     title: "2n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
     title: "3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.40Ge2P1Xl710-Ethip4-Ip4Scale2M-rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
   layout:
     title: "3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     title: "2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-78b-ip6routing-base-scale-avf-ndr-tsa"
   algorithm: "plot_tsa_name"
     title: "2n-skx-xxv710-78b-ip6routing-base-scale-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
     title: "3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.40Ge2P1Xl710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
   layout:
     title: "3n-hsw-xl710-78b-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr-tsa"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-ip4routing-base-scale-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-ndr-tsa"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4-Ip4Scale20K-rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-ip4routing-base-scale-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
 #    title: "3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-pdr-tsa"
 #    layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Dot1Q-Ip4Base-Ndrpdr.64B-.t.c-dot1q-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Ndrpdr.64B-.t.c-ethip4-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale20K-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale200K-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Scale2M-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-ip4routing-base-scale-dpdk-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-features-ip4routing-base-scale-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-features-ip4routing-base-scale-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-.t.c-ethip4-ip4base-iacldstbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-ip4routing-features-base-scale-dpdk-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-features-ip4routing-base-scale-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-features-ip4routing-base-scale-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4-Ip4Base-Iacldstbase-Ndrpdr.64B-.t.c-ethip4-ip4base-iacldstbase-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-40Ge2P1Xl710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-ip4routing-features-base-scale-dpdk-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-.t.c-ethip6-ip6base-iacldstbase-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale20K-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale200K-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-40Ge2P1Xl710-Ethip6-Ip6Base-Iacldstbase-Ndrpdr.78B-.t.c-ethip6-ip6base-iacldstbase-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-l2switching-base-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-l2switching-base-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-l2switching-base-dpdk-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-l2switching-base-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-l2switching-base-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-l2switching-base-dpdk-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-l2switching-scale-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-l2switching-scale-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-l2switching-scale-dpdk-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-l2switching-scale-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-l2switching-scale-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale10Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale10kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale100kmaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-.t.c-eth-l2bdscale1mmaclrn-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-l2switching-scale-dpdk-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-features-l2switching-base-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-features-l2switching-base-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-features-l2switching-base-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-tx2-xl710-64b-features-l2switching-base-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-tx2-xl710-64b-features-l2switching-base-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-tx2"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-40Ge2P1Xl710-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-features-l2switching-base-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Packet Throughput - DPDK
     title: "3n-tsh-x520-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
+# 2n-tx2-xl710
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-tx2-xl710-64b-1t1c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-tx2"
+  include:
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-tx2-xl710-64b-2t2c-base-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-2n-tx2"
+  include:
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-tx2-xl710-64b-1t1c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-tx2"
+  include:
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "DPDK Throughput: 2n-tx2-xl710-64b-2t2c-base-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,DPDK]}/2n-tx2-xl710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-2n-tx2"
+  include:
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.2N1L-40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+  layout:
+    title: "2n-tx2-xl710-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
 ################################################################################
 ###   2n-clx                                                                 ###
 ################################################################################
     title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-tput-avf-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-tput-avf-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
   algorithm: "plot_perf_box_name"
 - type: "plot"
   title: "Throughput: 2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "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-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+  layout:
+    title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "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-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
   layout:
-    title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
+    title: "2n-clx-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
     title: "2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr"
   algorithm: "plot_perf_box_name"
     title: "2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-clx-cx556a-78b-2t1c-rdma-ip6routing-base-scale-ndr"
   algorithm: "plot_perf_box_name"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-2t1c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-2t1c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-2t1c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-2t1c-rdma-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-2t1c-rdma-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-2t1c-rdma-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-ndrpdr"
     title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Tcp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-tput-avf-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H4096-P63-S258048-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Nat44Ed-H262144-P63-S16515072-Tput-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-tput-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-tput-avf-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     title: "2n-clx-cx556a-64b-rdma-ethip4-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-clx-x710-78b-ip6routing-base-scale-[avf,dpdk]-ndr-tsa"
   algorithm: "plot_tsa_name"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     title: "2n-clx-xxv710-78b-ip6routing-base-scale-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     title: "2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-clx-cx556a-78b-rdma-ip6routing-base-scale-ndr-tsa"
   algorithm: "plot_tsa_name"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-avf-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Patch-Ndrpdr.64B-.t.c-avf-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-.t.c-avf-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-avf-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Patch-Ndrpdr.64B-.t.c-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-.t.c-rdma-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-ndrpdr"
   include:
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-ndrpdr"
-    - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Gbp-Ndrpdr.64B-.t.c-rdma-dot1q-l2bdbasemaclrn-gbp-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Patch-Ndrpdr.64B-.t.c-rdma-eth-l2patch-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-ndrpdr"
     - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-ndrpdr"
     title: "2n-zn2-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-2t1c-ethip4--ethip4udpgeneve-avf-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-zn2-x710-78b-2t1c-ip6routing-base-scale-[avf,dpdk]-ndr"
   algorithm: "plot_perf_box_name"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-2t1c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-ndrpdr"
     title: "2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-avf-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-avf-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr"
   algorithm: "plot_perf_box_name"
     title: "2n-zn2-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-2t1c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-2t1c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-2t1c-ip6routing-rnd-base-scale-dpdk-pdr"
+    layout: "plot-throughput"
+
 - type: "plot"
   title: "Throughput: 2n-zn2-cx556a-78b-2t1c-rdma-ip6routing-base-scale-ndr"
   algorithm: "plot_perf_box_name"
     title: "2n-zn2-cx556a-64b-rdma-ethip4-features-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-1Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-1tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-4Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-4tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-16Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-16tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-64Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-64tun-ip4base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4 Tunnels.2N1L-25Ge2P1Xxv710-Avf-Ethip4--Ethip4Udpgeneve-256Tun-Ip4Base-Ndrpdr.64B-.t.c-avf-ethip4--ethip4udpgeneve-256tun-ip4base-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-64b-ethip4--ethip4udpgeneve-avf-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-zn2-x710-78b-ip6routing-base-scale-[avf,dpdk]-ndr-tsa"
   algorithm: "plot_tsa_name"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-avf-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Dot1Q-Ip6Base-Ndrpdr.78B-.t.c-dot1q-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
     - "Tests.Vpp.Perf.Ip6.2N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-ndrpdr"
     title: "2n-zn2-xxv710-78b-ip6routing-base-scale-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-avf-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-avf-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     title: "2n-zn2-xxv710-78b-ip6routing-base-scale-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-zn2"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Ndrpdr.78B-.t.c-ethip6-ip6base-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale20K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale200K-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-rnd-Ndrpdr.78B-.t.c-ethip6-ip6scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-zn2-xxv710-78b-ip6routing-rnd-base-scale-dpdk-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-zn2-cx556a-78b-rdma-ip6routing-base-scale-ndr-tsa"
   algorithm: "plot_tsa_name"
 
 - type: "plot"
   title: "Latency by percentile: 2n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-skx"
   output-file-links: "{DIR[LAT,VPP]}/2n_skx.rst"
   target-links: "../../_static/vpp"
   data: "plot-vpp-hdrh-lat-2n-skx"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: 2n-skx RND"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-skx"
+  output-file-links: "{DIR[LAT,VPP]}/2n_skx.rst"
+  target-links: "../../_static/vpp"
+  data: "plot-vpp-hdrh-lat-2n-skx-rnd"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-skx-nat44"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  title: "Latency by percentile: 2n-skx NAT"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-skx"
   output-file-links: "{DIR[LAT,VPP]}/2n_skx.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-skx-nat44"
+  data: "plot-vpp-hdrh-lat-2n-skx-nat"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 2n-zn2"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-zn2"
   output-file-links: "{DIR[LAT,VPP]}/2n_zn2.rst"
   target-links: "../../_static/vpp"
   data: "plot-vpp-hdrh-lat-2n-zn2"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: 2n-zn2 RND"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-zn2"
+  output-file-links: "{DIR[LAT,VPP]}/2n_zn2.rst"
+  target-links: "../../_static/vpp"
+  data: "plot-vpp-hdrh-lat-2n-zn2-rnd"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 3n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-skx"
   output-file-links: "{DIR[LAT,VPP]}/3n_skx.rst"
   target-links: "../../_static/vpp"
   data: "plot-vpp-hdrh-lat-3n-skx"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 2n-clx"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
   output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
   target-links: "../../_static/vpp"
   data: "plot-vpp-hdrh-lat-2n-clx"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
-  title: "Latency by percentile: 2n-clx-nat44"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  title: "Latency by percentile: 2n-clx RND"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
   output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
   target-links: "../../_static/vpp"
-  data: "plot-vpp-hdrh-lat-2n-clx-nat44"
+  data: "plot-vpp-hdrh-lat-2n-clx-rnd"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: 2n-clx NAT"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
+  output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
+  target-links: "../../_static/vpp"
+  data: "plot-vpp-hdrh-lat-2n-clx-nat"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 3n-hsw"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-hsw"
   output-file-links: "{DIR[LAT,VPP]}/3n_hsw.rst"
   target-links: "../../_static/vpp"
   data: "plot-vpp-hdrh-lat-3n-hsw"
   filter: "'1T1C' and 'NIC_Intel-XL710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: 3n-hsw RND"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-hsw"
+  output-file-links: "{DIR[LAT,VPP]}/3n_hsw.rst"
+  target-links: "../../_static/vpp"
+  data: "plot-vpp-hdrh-lat-3n-hsw-rnd"
+  filter: "'1T1C' and 'NIC_Intel-XL710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: 3n-tsh"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-tsh"
   output-file-links: "{DIR[LAT,VPP]}/3n_tsh.rst"
   target-links: "../../_static/vpp"
   data: "plot-vpp-hdrh-lat-3n-tsh"
   filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: 2n-tx2"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-tx2"
+  output-file-links: "{DIR[LAT,VPP]}/2n-tx2.rst"
+  target-links: "../../_static/vpp"
+  data: "plot-vpp-hdrh-lat-2n-tx2"
+  filter: "'1T1C' and 'NIC_Intel-XL710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: DPDK 2n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-skx"
   output-file-links: "{DIR[LAT,DPDK]}/2n_skx.rst"
   target-links: "../../_static/dpdk"
   data: "plot-dpdk-hdrh-lat-2n-skx"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: DPDK 3n-skx"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-skx"
   output-file-links: "{DIR[LAT,DPDK]}/3n_skx.rst"
   target-links: "../../_static/dpdk"
   data: "plot-dpdk-hdrh-lat-3n-skx"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: DPDK 2n-clx"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-clx"
   output-file-links: "{DIR[LAT,DPDK]}/2n_clx.rst"
   target-links: "../../_static/dpdk"
   data: "plot-dpdk-hdrh-lat-2n-clx"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: DPDK 2n-zn2"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-zn2"
   output-file-links: "{DIR[LAT,DPDK]}/2n_zn2.rst"
   target-links: "../../_static/dpdk"
   data: "plot-dpdk-hdrh-lat-2n-zn2"
   filter: "'2T1C' and 'NIC_Intel-XXV710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: DPDK 3n-hsw"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-hsw"
   output-file-links: "{DIR[LAT,DPDK]}/3n_hsw.rst"
   target-links: "../../_static/dpdk"
   data: "plot-dpdk-hdrh-lat-3n-hsw"
   filter: "'1T1C' and 'NIC_Intel-XL710'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
 
 - type: "plot"
   title: "Latency by percentile: DPDK 3n-tsh"
-  algorithm: "plot_hdrh_lat_by_percentile"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
   output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-3n-tsh"
   output-file-links: "{DIR[LAT,DPDK]}/3n_tsh.rst"
   target-links: "../../_static/dpdk"
   data: "plot-dpdk-hdrh-lat-3n-tsh"
   filter: "'1T1C' and 'NIC_Intel-X520-DA2'"
   layout:
-    layout: "plot-hdrh-latency-by-percentile"
+    layout: "plot-hdrh-latency-percentile-x-log"
+
+- type: "plot"
+  title: "Latency by percentile: DPDK 2n-tx2"
+  algorithm: "plot_hdrh_lat_by_percentile_x_log"
+  output-file: "{DIR[STATIC,DPDK]}/hdrh-lat-percentile-2n-tx2"
+  output-file-links: "{DIR[LAT,DPDK]}/2n-tx2.rst"
+  target-links: "../../_static/dpdk"
+  data: "plot-dpdk-hdrh-lat-2n-tx2"
+  filter: "'1T1C' and 'NIC_Intel-XL710'"
+  layout:
+    layout: "plot-hdrh-latency-percentile-x-log"