Report: Add data
[csit.git] / resources / tools / presentation / specification.yaml
index a044f8b..bded30c 100644 (file)
       x710: 35800000
       xxv710: 35800000
       xl710: 35800000
-      cx556a: 60000000
+      cx556a: 148809523.81
 
     link:
       10ge: 14880952.38
     # 3n-hsw
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
+      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
 
     plot-vpp-hdrh-lat-3n-hsw:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 3   # NDRPDR sel
-
-#    plot-vpp-nfv-3n-hsw-ndrpdr:
-#      csit-vpp-perf-report-iterative-2005-3n-hsw:
-#        - 3   # NDRPDR sel
-#        - 4   # NDRPDR sel
-#        - 5   # NDRPDR sel
-#        - 10  # NDRPDR sel
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 15  # NDRPDR sel
-#        - 16  # NDRPDR sel
-#        - 18  # NDRPDR sel
-#        - 19  # NDRPDR sel
-
-#    plot-vpp-nfv-3n-hsw-mrr:
-#      csit-vpp-perf-report-iterative-2005-3n-hsw:
-#        - 13  # MRR
+      csit-vpp-perf-report-iterative-2009-3n-hsw:
+        - 22  # rls2009 NDRPDR iter env 5
 
     plot-vpp-hoststack-3n-hsw:
-      csit-vpp-perf-verify-2005-3n-hsw:
-        - 3   # hoststack
-        - 5   # hoststack
-        - 6   # hoststack
-        - 7   # hoststack
-        - 8   # hoststack
-        - 9   # hoststack
-        - 10  # hoststack
-        - 11  # hoststack
-        - 12  # hoststack
-        - 13  # hoststack
+      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
 
     plot-dpdk-throughput-latency-3n-hsw:
-      csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 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
-        - 14  # NDRPDR sel
+      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
 
     plot-dpdk-hdrh-lat-3n-hsw:
-      csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 5   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-3n-hsw:
+        - 6   # NDRPDR iter env5
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
+      # TODO: Add:
+      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
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
 
     plot-vpp-hdrh-lat-3n-skx:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 36  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2009-3n-skx:
+        - 27  # rls2009 NDRPDR iter env 5
 
-    plot-vpp-nfv-3n-skx-ndrpdr:
-      # TODO: Add data:
-      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
+#    plot-vpp-nfv-3n-skx-ndrpdr:
+#      # No data
+#      csit-vpp-perf-report-iterative-2009-3n-skx:
 
-    plot-vpp-nfv-3n-skx-mrr:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 6   # MRR sel
+#    plot-vpp-nfv-3n-skx-mrr:
+#      # No data
+#      csit-vpp-perf-report-iterative-2009-3n-skx:
 
     plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
+      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
 
     plot-dpdk-hdrh-lat-3n-skx:
-      csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-3n-skx:
+        - 4   # NDRPDR sel env5
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
+      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
+        - 51  # rls2009 NDRPDR iter NAT44 env 5
+        - 52  # rls2009 NDRPDR iter NAT44 env 5
+        - 53  # rls2009 NDRPDR iter NAT44 env 5
+        - 54  # rls2009 NDRPDR iter NAT44 env 5
+        - 55  # rls2009 NDRPDR iter NAT44 env 5
+        - 56  # rls2009 NDRPDR iter NAT44 env 5
+        - 57  # rls2009 NDRPDR iter NAT44 env 5
+        - 58  # rls2009 NDRPDR iter NAT44 env 5
+        - 59  # rls2009 NDRPDR iter NAT44 env 5
+        - 60  # rls2009 NDRPDR iter NAT44 env 5
 
     plot-vpp-hdrh-lat-2n-skx:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 55  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 35  # rls2009 NDRPDR iter env 5
+
+    plot-vpp-hdrh-lat-2n-skx-nat44:
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 51  # rls2009 NDRPDR iter NAT44 env 5
 
     plot-vpp-soak-2n-skx:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 49  # Soak
-        - 54  # Soak
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 33  # rls2009 soak env 5
+        - 34  # rls2009 soak env 5
 
     plot-vpp-nfv-2n-skx-ndrpdr:
-      # TODO: Add data:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 83  # nf-density-sel
+      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
 
     plot-vpp-nfv-2n-skx-mrr:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 42  # MRR sel
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 50  # rls2009 MRR nf-density iter env 5
 
     plot-vpp-nfv-reconf-2n-skx:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 48  # Reconf
-        - 50  # Reconf
-        - 51  # Reconf
-        - 52  # Reconf
-        - 53  # Reconf
-        - 60  # Reconf
-        - 70  # Reconf
-        - 71  # Reconf
-        - 63  # Reconf
-        - 66  # Reconf
+      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
 
     plot-dpdk-throughput-latency-2n-skx:
-      csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+      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
 
     plot-dpdk-hdrh-lat-2n-skx:
-      csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-2n-skx:
+        - 4   # NDRPDR iter env5
 
     # 2n-clx
 
     plot-vpp-throughput-lat-tsa-2n-clx:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 32  # NDRPDR sel ???
-        - 33  # NDRPDR sel ???
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 51  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 36  # rls2009 NDRPDR iter env 5
+        - 38  # rls2009 NDRPDR iter env 5
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
+        - 41  # rls2009 NDRPDR iter env 5
+        - 42  # rls2009 NDRPDR iter env 5
+        - 64  # rls2009 NDRPDR iter env 5
+        - 65  # rls2009 NDRPDR iter env 5
+        - 66  # rls2009 NDRPDR iter env 5
+        - 67  # rls2009 NDRPDR iter env 5
 
     plot-vpp-hdrh-lat-2n-clx:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 51  # NDRPDR sel
-
-#    plot-vpp-http-server-performance:
-#      # csit-vpp-perf-report-iterative-2005-2n-clx:
-#      csit-vpp-perf-verify-2001-2n-clx:
-#        - 80  # TCP
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 36  # rls2009 NDRPDR iter env 5
 
     plot-vpp-nfv-2n-clx-ndrpdr:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 57  # 2n-clx nfv-density-00
-        - 58  # 2n-clx nfv-density-00
-        - 59  # 2n-clx nfv-density-00
-        - 60  # 2n-clx nfv-density-00
-        - 61  # 2n-clx nfv-density-00
+      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
 
     plot-vpp-nfv-2n-clx-mrr:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 12   # MRR
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 45  # rls2009 MRR nf-density iter env 5
 
     plot-vpp-nfv-reconf-2n-clx:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 42  # Reconf
-        - 45  # Reconf
-        - 46  # Reconf
-        - 47  # Reconf
-        - 48  # Reconf
-        - 52  # Reconf
-        - 53  # Reconf
-        - 54  # Reconf
-        - 55  # Reconf
-        - 56  # Reconf
+      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
 
     plot-vpp-soak-2n-clx:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 44  # Soak
-        - 49  # Soak
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 33  # rls2009 soak env 5
+        - 34  # rls2009 soak env 5
 
     plot-dpdk-throughput-latency-2n-clx:
-      csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+      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
 
     plot-dpdk-hdrh-lat-2n-clx:
-      csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-2n-clx:
+        - 4   # NDRPDR iter env5
 
     # 3n-tsh
 
     plot-vpp-throughput-lat-tsa-3n-tsh:
-      # TODO: Add data:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 9   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 14  # NDRPDR sel
+      # TODO: Add:
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 14  # rls2009 NDRPDR iter env 5
+        - 20  # rls2009 NDRPDR iter env 5
+        - 22  # rls2009 NDRPDR iter env 5
+        - 23  # rls2009 NDRPDR iter env 5
 
     plot-vpp-hdrh-lat-3n-tsh:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 9   # NDRPDR sel
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 14  # rls2009 NDRPDR iter env 5
 
     plot-dpdk-throughput-latency-3n-tsh:
-      csit-dpdk-perf-report-iterative-2005-3n-tsh:
-        - 5   # NDRPDR sel
+      # TODO: Add:
+      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
 
     plot-dpdk-hdrh-lat-3n-tsh:
-      csit-dpdk-perf-report-iterative-2005-3n-tsh:
-        - 5   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-3n-tsh:
+        - 1   # NDRPDR iter env5
 
     # 3n-dnv
 
     plot-vpp-throughput-lat-tsa-3n-dnv:
-      csit-vpp-perf-report-iterative-2005-3n-dnv:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-3n-dnv:
-      csit-dpdk-perf-report-iterative-2005-3n-dnv:
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
+      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
+
+#    plot-dpdk-throughput-latency-3n-dnv:
+#      # No data
+#      csit-dpdk-perf-report-iterative-2009-3n-dnv:
 
     # 2n-dnv
 
     plot-vpp-throughput-lat-tsa-2n-dnv:
-      csit-vpp-perf-report-iterative-2005-2n-dnv:
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-2n-dnv:
-      csit-dpdk-perf-report-iterative-2005-2n-dnv:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
+      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
+
+#    plot-dpdk-throughput-latency-2n-dnv:
+#      # No data
+#      csit-dpdk-perf-report-iterative-2009-2n-dnv:
 
     ###########################################################################
     # Simple tables (only one data set):
     # NIC Comparisons
 
     vpp-nic-comparison-3n-skx:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
+      # TODO: Add:
+      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
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
 
     vpp-nic-comparison-2n-skx:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
+      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
+        - 51  # rls2009 NDRPDR iter NAT44 env 5
+        - 52  # rls2009 NDRPDR iter NAT44 env 5
+        - 53  # rls2009 NDRPDR iter NAT44 env 5
+        - 54  # rls2009 NDRPDR iter NAT44 env 5
+        - 55  # rls2009 NDRPDR iter NAT44 env 5
+        - 56  # rls2009 NDRPDR iter NAT44 env 5
+        - 57  # rls2009 NDRPDR iter NAT44 env 5
+        - 58  # rls2009 NDRPDR iter NAT44 env 5
+        - 59  # rls2009 NDRPDR iter NAT44 env 5
+        - 60  # rls2009 NDRPDR iter NAT44 env 5
 
     vpp-nic-comparison-3n-skx-mrr:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 6   # MRR sel
+      csit-vpp-perf-report-iterative-2009-3n-skx:
+        - 24  # rls2009 MRR iter env 5
 
     vpp-nic-comparison-2n-skx-mrr:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 42  # MRR sel
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 26  # rls2009 MRR iter env 5
 
     # Results
 
     vpp-perf-results-3n-hsw:
-      csit-vpp-perf-report-coverage-2005-3n-hsw:
-        - 1   # perf-full-3n-dnv-crypto_I
-        - 7   # perf-full-3n-hsw-crypto_II
-        - 3   # perf-full-3n-hsw-crypto_III
-        - 4   # perf-full-3n-dnv-crypto_IV
-        - 5   # perf-full-3n-hsw-ip4_I
-        - 6   # perf-full-3n-hsw-ip4_II
-        - 8   # perf-full-3n-hsw-ip4_III
-        - 9   # perf-full-3n-hsw-ip4_IV
-        - 10  # perf-full-3n-hsw-ip4_V
-        - 26  # perf-full-3n-hsw-ip4_VI
-        - 18  # perf-full-3n-hsw-ip4_VII
-        - 27  # perf-full-3n-hsw-ip4_VIII
-        - 28  # perf-full-3n-hsw-ip4_IX
-        - 29  # perf-full-3n-hsw-ip6_I
-        - 35  # perf-full-3n-hsw-ip6_II
-        - 42  # perf-full-3n-hsw-l2_I
-        - 33  # perf-full-3n-hsw-l2_II
-        - 37  # perf-full-3n-hsw-l2_III
-        - 45  # perf-full-3n-hsw-l2_IV
-        - 43  # perf-full-3n-hsw-l2_V
-        - 40  # perf-full-3n-hsw-l2_VI
-        - 44  # perf-full-3n-hsw-l2_VII
-        - 51  # perf-full-3n-hsw-l2_VIII
-        - 50  # perf-full-3n-hsw-l2_IX
-        - 52  # perf-full-3n-hsw-l2_X
-        - 53  # perf-full-3n-hsw-l2_XI
-        - 54  # perf-full-3n-hsw-memif
-        - 55  # perf-full-3n-hsw-ip4tunnels-I
-        - 56  # perf-full-3n-hsw-ip4tunnels-II
-        - 57  # perf-full-3n-hsw-ip4tunnels-III
-        - 58  # perf-full-3n-hsw-ip6tunnels-I
-        - 59  # perf-full-3n-hsw-srv6-I
-        - 60  # perf-full-3n-hsw-srv6-II
-        - 61  # perf-full-3n-hsw-vhost-I
-        - 62  # perf-full-3n-hsw-vhost-II
-        - 63  # perf-full-3n-hsw-vhost-III
+      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
 
     vpp-perf-results-3n-skx:
-      csit-vpp-perf-report-coverage-2005-3n-skx:
-        - 10  # perf-full-3n-skx-crypto_I
-        - 11  # perf-full-3n-skx-crypto_II
-        - 12  # perf-full-3n-skx-crypto_III
-        - 5   # perf-full-3n-skx-ip4_I
-        - 14  # perf-full-3n-skx-ip4_II
-        - 7   # perf-full-3n-skx-ip4_III
-        - 15  # perf-full-3n-skx-ip4_IV
-        - 16  # perf-full-3n-skx-ip4_V
-        - 17  # perf-full-3n-skx-ip4_VI
-        - 18  # perf-full-3n-skx-ip4_VII
-        - 19  # perf-full-3n-skx-ip4_VIII
-        - 20  # perf-full-3n-skx-ip4_IX
-        - 24  # perf-full-3n-skx-ip6_I
-        - 25  # perf-full-3n-skx-ip6_II
-        - 22  # perf-full-3n-skx-ip4tunnels-II
-        - 23  # perf-full-3n-skx-ip4tunnels-III
-        - 26  # perf-full-3n-skx-ip6tunnels-I
-        - 28  # perf-full-3n-skx-l2_II
-        - 29  # perf-full-3n-skx-l2_III
-        - 30  # perf-full-3n-skx-l2_IV
-        - 32  # perf-full-3n-skx-l2_VI
-        - 33  # perf-full-3n-skx-l2_VII
-        - 35  # perf-full-3n-skx-l2_IX
-        - 36  # perf-full-3n-skx-l2_X
-        - 37  # perf-full-3n-skx-l2_XI
+      # TODO: Add:
+      csit-vpp-perf-report-coverage-2009-3n-skx:
+        - 9   # rls2009 NDRPDR cov 3n-skx-ip4-03
+        - 16  # rls2009 NDRPDR cov 3n-skx-ip4tun-02
 
     vpp-perf-results-2n-skx:
-      # TODO: Add data:
-      csit-vpp-perf-report-coverage-2005-2n-skx:
-        - 11  # perf-full-2n-skx-ip4_I
-        - 3   # perf-full-2n-skx-ip4_II
-        - 18  # perf-full-2n-skx-ip4_III
-        - 19  # perf-full-2n-skx-ip4_IV
-        - 5   # perf-full-2n-skx-ip4_V
-        - 20  # perf-full-2n-skx-ip4_VI
-        - 7   # perf-full-2n-skx-ip6_I
-        - 21  # perf-full-2n-skx-ip6_II
-        - 9   # perf-full-2n-skx-l2_I
-        - 22  # perf-full-2n-skx-l2_II
-        - 23  # perf-full-2n-skx-memif
-        - 24  # perf-full-2n-skx-loadbalancer
-        - 25  # perf-full-2n-skx-vhost I
-        - 26  # perf-full-2n-skx-vhost II
-        - 27  # perf-full-2n-skx-vts
+      csit-vpp-perf-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
+        - 13  # rls2009 NDRPDR cov 2n-skx-ip4-05
+        - 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
 
     vpp-perf-results-2n-clx:
-      csit-vpp-perf-report-coverage-2005-2n-clx:
-        - 21  # perf-full-2n-clx-ip4_I
-        - 2   # perf-full-2n-clx-ip4_II
-        - 3   # perf-full-2n-clx-ip4_III
-        - 4   # perf-full-2n-clx-ip4_IV
-        - 5   # perf-full-2n-clx-ip4_V
-        - 6   # perf-full-2n-clx-ip4_VI
-        - 7   # perf-full-2n-clx-ip6_I
-        - 16  # perf-full-2n-clx-ip6_II
-        - 23  # perf-full-2n-clx-l2_I
-        - 10  # perf-full-2n-clx-l2_II
-        - 11  # perf-full-2n-clx-memif
-        - 12  # perf-full-2n-clx-loadbalancer
-        - 13  # perf-full-2n-clx-vhost I
-        - 22  # perf-full-2n-clx-vhost II
-        - 15  # perf-full-2n-clx-vts
+      # TODO: Add:
+      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
+        - 7   # rls2009 NDRPDR cov 2n-clx-ip4-05
+        - 8   # 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
 
     vpp-perf-results-3n-tsh:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 9   # NDRPDR sel
+      # TODO: Replace???
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 14  # rls2009 NDRPDR iter env 5
+#      csit-vpp-perf-report-coverage-2009-3n-tsh:
+#        -
 
     vpp-perf-results-3n-dnv:
-      csit-vpp-perf-report-coverage-2005-3n-dnv:
-        - 1   # perf-full-3n-dnv-crypto_I
-        - 24  # perf-full-3n-dnv-crypto_II
-        - 5   # perf-full-3n-dnv-ip4_I
-        - 13  # perf-full-3n-dnv-ip4_II
-        - 17  # perf-full-3n-dnv-ip6_I
-        - 18  # perf-full-3n-dnv-ip6_II
-        - 21  # perf-full-3n-dnv-l2_I
-        - 22  # perf-full-3n-dnv-l2_II
-        - 23  # perf-full-3n-dnv-ip4-tunnels_I
+      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
 
     vpp-perf-results-2n-dnv:
-      csit-vpp-perf-report-coverage-2005-2n-dnv:
-        - 1   # perf-full-2n-dnv-ip4_I
-        - 2   # perf-full-2n-dnv-ip4_II
-        - 3   # perf-full-2n-dnv-ip6_I
-        - 4   # perf-full-2n-dnv-ip6_II
-        - 5   # perf-full-2n-dnv-l2_I
-        - 6   # perf-full-2n-dnv-l2_II
+      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
 
     vpp-mrr-results-3n-hsw:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 13  # MRR
+      csit-vpp-perf-report-iterative-2009-3n-hsw:
+        - 23  # rls2009 MRR iter env 5
 
     vpp-mrr-results-3n-skx:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 6   # MRR sel
+      csit-vpp-perf-report-iterative-2009-3n-skx:
+        - 24  # rls2009 MRR iter env 5
 
     vpp-mrr-results-2n-skx:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 42  # MRR sel
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 26  # rls2009 MRR iter env 5
 
     vpp-mrr-results-2n-clx:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 12   # MRR
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 78  # rls2009 MRR iter env 5
 
     vpp-mrr-results-3n-tsh:
-      csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 10  # MRR sel
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 15  # rls2006 MRR iter env 5
 
     vpp-mrr-results-3n-dnv:
-      csit-vpp-perf-report-iterative-2005-3n-dnv:
-        - 8   # MRR
+      csit-vpp-perf-report-iterative-2009-3n-dnv:
+        - 22  # rls2009 MRR iter env 5
 
     vpp-mrr-results-2n-dnv:
-      csit-vpp-perf-report-iterative-2005-2n-dnv:
-        - 15  # MRR sel
+      csit-vpp-perf-report-iterative-2009-2n-dnv:
+        - 13  # rls2009 MRR iter env 5
 
     vpp-device-results-ubuntu:
-      csit-vpp-device-2005-ubuntu1804-1n-skx:
-        - 35
+      csit-vpp-device-2009-ubuntu1804-1n-skx:
+        - 131 # rls2009 env 5
 
     dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 5   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-3n-hsw:
+        - 6   # NDRPDR iter env5
 
     dpdk-perf-results-3n-skx:
-      csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-3n-skx:
+        - 4   # NDRPDR sel env5
 
     dpdk-perf-results-2n-skx:
-      csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-2n-skx:
+        - 4   # NDRPDR iter env5
 
     dpdk-perf-results-2n-clx:
-      csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-2n-clx:
+        - 4   # NDRPDR iter env5
 
-    dpdk-perf-results-2n-dnv:
-      csit-dpdk-perf-report-iterative-2005-2n-dnv:
-        - 8   # NDRPDR sel
+#    dpdk-perf-results-2n-dnv:
+#      # No data
+#      csit-dpdk-perf-report-iterative-2009-2n-dnv:
 
-    dpdk-perf-results-3n-dnv:
-      csit-dpdk-perf-report-iterative-2005-3n-dnv:
-        - 6   # NDRPDR sel
+#    dpdk-perf-results-3n-dnv:
+#      # No data
+#      csit-dpdk-perf-report-iterative-2009-3n-dnv:
 
     dpdk-perf-results-3n-tsh:
-      csit-dpdk-perf-report-iterative-2005-3n-tsh:
-        - 5   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2009-3n-tsh:
+        - 1   # NDRPDR iter env5
 
 ###########################################################################
     # Tables (more than one data set)
     # Performance changes
 
     vpp-performance-changes-3n-hsw-h1:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-ref:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 34  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-cmp:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-cmp-2:
+        - 31  # NDRPDR sel 2001.0-4
+        - 32  # NDRPDR sel 2001.0-4
+        - 33  # NDRPDR sel 2001.0-4
+        - 34  # NDRPDR sel 2001.0-4
+        - 35  # NDRPDR sel 2001.0-4
+        - 36  # NDRPDR sel 2001.0-4
+        - 38  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-3n-hsw-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 20  # NDRPDR sel env 2
-        - 21  # NDRPDR sel env 2
-        - 22  # NDRPDR sel env 2
+        - 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
+        - 11  # rls2005 NDRPDR iter env 5
+        - 12  # rls2005 NDRPDR iter env 5
+        - 13  # rls2005 NDRPDR iter env 5
+        - 14  # rls2005 NDRPDR iter env 5
+        - 15  # rls2005 NDRPDR iter env 5
+        - 16  # rls2005 NDRPDR iter env 5
+        - 17  # rls2005 NDRPDR iter env 5
+        - 19  # rls2005 NDRPDR iter env 5
+    vpp-performance-changes-3n-hsw-cmp:
+      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
 
     vpp-performance-changes-3n-skx-h1:
-      csit-vpp-perf-verify-1908_1-3n-skx:
-        - 26  # NDRPDR sel - new1908.1
-        - 27  # NDRPDR sel - new1908.1
-        - 28  # NDRPDR sel - new1908.1
-        - 29  # NDRPDR sel - new1908.1
-        - 30  # NDRPDR sel - new1908.1
-        - 31  # NDRPDR sel - new1908.1
-        - 33  # NDRPDR sel - new1908.1
-        - 34  # NDRPDR sel - new1908.1
-        - 35  # NDRPDR sel - new1908.1
-        - 36  # NDRPDR sel - new1908.1
-    vpp-performance-changes-3n-skx-ref:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0
-        - 71  # NDRPDR sel - new2001.0
-        - 72  # NDRPDR sel - new2001.0
-        - 76  # NDRPDR sel - new2001.0
-        - 77  # NDRPDR sel - new2001.0
-        - 78  # NDRPDR sel - new2001.0
-        - 80  # NDRPDR sel - new2001.0
-    vpp-performance-changes-3n-skx-cmp:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
-    vpp-performance-changes-3n-skx-cmp-2:
+        - 50  # NDRPDR sel 2001.0-4
+        - 51  # NDRPDR sel 2001.0-4
+        - 52  # NDRPDR sel 2001.0-4
+        - 53  # NDRPDR sel 2001.0-4
+        - 54  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-3n-skx-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        # TODO: Replace
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
+        - 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
+        - 19  # rls2005 NDRPDR iter env 5
+        - 41  # rls2005 NDRPDR iter env 5
+    vpp-performance-changes-3n-skx-cmp:
+      # TODO: Add:
+      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
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
 
     vpp-performance-changes-2n-skx-h1:
-      csit-vpp-perf-verify-1908_1-2n-skx:
-        - 39  # NDRPDR sel - new1908.1
-        - 40  # NDRPDR sel - new1908.1
-        - 41  # NDRPDR sel - new1908.1
-        - 43  # NDRPDR sel - new1908.1
-        - 44  # NDRPDR sel - new1908.1
-        - 45  # NDRPDR sel - new1908.1
-        - 46  # NDRPDR sel - new1908.1
-        - 47  # NDRPDR sel - new1908.1
-        - 48  # NDRPDR sel - new1908.1
-        - 49  # NDRPDR sel - new1908.1
-    vpp-performance-changes-2n-skx-ref:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0
-        - 146  # NDRPDR sel - new2001.0
-        - 147  # NDRPDR sel - new2001.0
-        - 148  # NDRPDR sel - new2001.0
-        - 149  # NDRPDR sel - new2001.0
-        - 150  # NDRPDR sel - new2001.0
-        - 151  # NDRPDR sel - new2001.0
-        - 152  # NDRPDR sel - new2001.0
-        - 153  # NDRPDR sel - new2001.0
-        - 154  # NDRPDR sel - new2001.0
-    vpp-performance-changes-2n-skx-cmp:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
-    vpp-performance-changes-2n-skx-cmp-2:
+        - 100 # NDRPDR sel 2001.0-4
+        - 101 # NDRPDR sel 2001.0-4
+        - 102 # NDRPDR sel 2001.0-4
+        - 103 # NDRPDR sel 2001.0-4
+        - 104 # NDRPDR sel 2001.0-4
+        - 105 # NDRPDR sel 2001.0-4
+    vpp-performance-changes-2n-skx-ref-env4:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        # TODO: Add data
-        - 88  # NDRPDR sel env 2
-
-#    vpp-performance-changes-nfv-2n-skx-ref:
-#      csit-vpp-perf-verify-2001-2n-skx:
-#        - 30  # NFV
-#        - 31  # NFV
-#    vpp-performance-changes-nfv-2n-skx-cmp:
-#      csit-vpp-perf-report-iterative-2005-2n-skx:
-#        - 43  # NDRPDR sel
-#        - 38  # NDRPDR sel
-#        - 7   # NDRPDR sel
-#        - 83  # nf-density-sel
-
-    vpp-performance-changes-2n-clx-ref:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # NDRPDR sel
-    vpp-performance-changes-2n-clx-cmp:
+        - 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
+        - 17  # rls2005 NDRPDR iter env 5
+        - 18  # rls2005 NDRPDR iter env 5
+        - 19  # rls2005 NDRPDR iter env 5
+        - 21  # rls2005 NDRPDR iter env 5
+        - 22  # 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:
+      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
+        - 51  # rls2009 NDRPDR iter NAT44 env 5
+        - 52  # rls2009 NDRPDR iter NAT44 env 5
+        - 53  # rls2009 NDRPDR iter NAT44 env 5
+        - 54  # rls2009 NDRPDR iter NAT44 env 5
+        - 55  # rls2009 NDRPDR iter NAT44 env 5
+        - 56  # rls2009 NDRPDR iter NAT44 env 5
+        - 57  # rls2009 NDRPDR iter NAT44 env 5
+        - 58  # rls2009 NDRPDR iter NAT44 env 5
+        - 59  # rls2009 NDRPDR iter NAT44 env 5
+        - 60  # rls2009 NDRPDR iter NAT44 env 5
+
+    vpp-performance-changes-2n-clx-h1:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 32  # NDRPDR sel ???
-        - 33  # NDRPDR sel ???
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 51  # NDRPDR sel
-    vpp-performance-changes-2n-clx-cmp-2:
+        - 73  # NDRPDR sel 2001.0-4
+        - 74  # NDRPDR sel 2001.0-4
+        - 75  # NDRPDR sel 2001.0-4
+        - 76  # NDRPDR sel 2001.0-4
+        - 77  # NDRPDR sel 2001.0-4
+        - 78  # NDRPDR sel 2001.0-4
+        - 79  # NDRPDR sel 2001.0-4
+        - 80  # NDRPDR sel 2001.0-4
+    vpp-performance-changes-2n-clx-ref-env4:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 62  # NDRPDR sel env 2
-        - 63  # NDRPDR sel env 2
+        - 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
+        - 17  # rls2005 NDRPDR iter env 5
+        - 18  # rls2005 NDRPDR iter env 5
+        - 19  # rls2005 NDRPDR iter env 5
+        - 20  # rls2005 NDRPDR iter env 5
+        - 21  # 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:
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 36  # rls2009 NDRPDR iter env 5
+        - 38  # rls2009 NDRPDR iter env 5
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
+        - 41  # rls2009 NDRPDR iter env 5
+        - 42  # rls2009 NDRPDR iter env 5
+        - 64  # rls2009 NDRPDR iter env 5
+        - 65  # rls2009 NDRPDR iter env 5
+        - 66  # rls2009 NDRPDR iter env 5
+        - 67  # rls2009 NDRPDR iter env 5
 
     vpp-performance-changes-2n-dnv-h1:
-      csit-vpp-perf-verify-1908-2n-dnv:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-    vpp-performance-changes-2n-dnv-ref:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 11  # NDRPDR sel
         - 13  # NDRPDR sel
         - 16  # NDRPDR sel
+    vpp-performance-changes-2n-dnv-ref:
+      csit-vpp-perf-report-iterative-2009-2n-dnv:
+        - 16  # rls2005 NDRPDR iter env 5
+        - 17  # rls2005 NDRPDR iter env 5
+        - 18  # rls2005 NDRPDR iter env 5
+        - 19  # rls2005 NDRPDR iter env 5
+        - 21  # rls2005 NDRPDR iter env 5
+        - 24  # rls2005 NDRPDR iter env 5
+        - 27  # 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:
-      csit-vpp-perf-report-iterative-2005-2n-dnv:
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-
-    vpp-performance-changes-3n-dnv-h1:
-      csit-vpp-perf-verify-1908-3n-dnv:
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-    vpp-performance-changes-3n-dnv-ref:
-      csit-vpp-perf-verify-2001-3n-dnv:
-        - 5   # NDRPDR sel
+      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-3n-dnv-h1:
+      csit-vpp-perf-verify-2001-3n-dnv:
+        - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 8   # 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
+        - 25  # rls2005 NDRPDR iter env 5
+        - 26  # rls2005 NDRPDR iter env 5
+        - 27  # rls2005 NDRPDR iter env 5
+        - 28  # rls2005 NDRPDR iter env 5
+        - 29  # 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:
-      csit-vpp-perf-report-iterative-2005-3n-dnv:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
+      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-tsh-h1:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-ref:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 21  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-cmp:
-      # TODO: Add data:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 9   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 14  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-cmp-2:
-      # TODO: replace:
+        - 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:
-        - 9   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 14  # NDRPDR sel
+        - 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
+        - 12  # rls2005 NDRPDR iter env 5
+    vpp-performance-changes-3n-tsh-cmp:
+      # TODO: Add:
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 14  # rls2009 NDRPDR iter env 5
+        - 20  # rls2009 NDRPDR iter env 5
+        - 22  # rls2009 NDRPDR iter env 5
+        - 23  # rls2009 NDRPDR iter env 5
 
     vpp-soak-vs-ndr-2n-skx-ref:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
+      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
     vpp-soak-vs-ndr-2n-skx-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 49  # Soak
-        - 54  # Soak
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 33  # rls2009 soak env 5
+        - 34  # rls2009 soak env 5
     vpp-soak-vs-ndr-2n-skx:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
-        - 49  # Soak
-        - 54  # Soak
+      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
 
     vpp-soak-vs-ndr-2n-clx-ref:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 32  # NDRPDR sel ???
-        - 33  # NDRPDR sel ???
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 51  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 36  # rls2009 NDRPDR iter env 5
+        - 38  # rls2009 NDRPDR iter env 5
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
+        - 41  # rls2009 NDRPDR iter env 5
+        - 42  # rls2009 NDRPDR iter env 5
+        - 64  # rls2009 NDRPDR iter env 5
+        - 65  # rls2009 NDRPDR iter env 5
+        - 66  # rls2009 NDRPDR iter env 5
+        - 67  # rls2009 NDRPDR iter env 5
     vpp-soak-vs-ndr-2n-clx-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 44  # Soak
-        - 49  # Soak
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 33  # rls2009 soak env 5
+        - 34  # rls2009 soak env 5
     vpp-soak-vs-ndr-2n-clx:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 32  # NDRPDR sel ???
-        - 33  # NDRPDR sel ???
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 51  # NDRPDR sel
-        - 44  # Soak
-        - 49  # Soak
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 36  # rls2009 NDRPDR iter env 5
+        - 38  # rls2009 NDRPDR iter env 5
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
+        - 41  # rls2009 NDRPDR iter env 5
+        - 42  # rls2009 NDRPDR iter env 5
+        - 64  # rls2009 NDRPDR iter env 5
+        - 65  # rls2009 NDRPDR iter env 5
+        - 66  # rls2009 NDRPDR iter env 5
+        - 67  # rls2009 NDRPDR iter env 5
+        - 33  # rls2009 soak env 5
+        - 34  # rls2009 soak env 5
 
     vpp-performance-changes-3n-hsw-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 39  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-verify-2001-3n-hsw:
         - 17  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-cmp:
+    vpp-performance-changes-3n-hsw-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 13  # MRR
+        - 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:
+      csit-vpp-perf-report-iterative-2009-3n-hsw:
+        - 23  # rls2009 MRR iter env 5
 
-#    vpp-performance-changes-3n-skx-mrr-h1:
-#      csit-vpp-perf-verify-1908-3n-skx:
-#        - 36  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-ref:
+    vpp-performance-changes-3n-skx-mrr-h1:
       csit-vpp-perf-verify-2001-3n-skx:
         - 50  # MRR sel
         - 53  # MRR sel addition
-    vpp-performance-changes-3n-skx-mrr-cmp:
+    vpp-performance-changes-3n-skx-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 6   # MRR sel
+        - 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:
+      csit-vpp-perf-report-iterative-2009-3n-skx:
+        - 24  # rls2009 MRR iter env 5
 
-#    vpp-performance-changes-2n-skx-mrr-h1:
-#      csit-vpp-perf-verify-1908-2n-skx:
-#        - 69  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-ref:
+    vpp-performance-changes-2n-skx-mrr-h1:
       csit-vpp-perf-verify-2001-2n-skx:
         - 101 # MRR sel
         - 128 # MRR sel addition
-    vpp-performance-changes-2n-skx-mrr-cmp:
+    vpp-performance-changes-2n-skx-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 42  # MRR sel
+        - 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:
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 26  # rls2009 MRR iter env 5
 
-    vpp-performance-changes-2n-clx-mrr-ref:
+    vpp-performance-changes-2n-clx-mrr-h1:
       csit-vpp-perf-verify-2001-2n-clx:
         - 39  # MRR
-    vpp-performance-changes-2n-clx-mrr-cmp:
+    vpp-performance-changes-2n-clx-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 12   # MRR
-
-#    vpp-performance-changes-nfv-2n-skx-mrr-ref:
-#      csit-vpp-perf-verify-1908-2n-skx:
-#        - 71  # NFV MRR
-#    vpp-performance-changes-nfv-2n-skx-mrr-cmp:
-#      # csit-vpp-perf-verify-2001-2n-skx:
-#      csit-vpp-perf-verify-1908-2n-skx:
-#        - 71  # NFV MRR
+        - 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:
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 78  # rls2009 MRR iter env 5
 
     vpp-performance-changes-2n-dnv-mrr-h1:
-      csit-vpp-perf-verify-1908-2n-dnv:
-        - 11  # MRR sel
-    vpp-performance-changes-2n-dnv-mrr-ref:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 12  # MRR sel
+    vpp-performance-changes-2n-dnv-mrr-ref:
+      csit-vpp-perf-report-iterative-2009-2n-dnv:
+        - 23  # rls2005 MRR iter env 5
     vpp-performance-changes-2n-dnv-mrr-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-dnv:
-        - 15  # MRR sel
+      csit-vpp-perf-report-iterative-2009-2n-dnv:
+        - 13  # rls2009 MRR iter env 5
 
     vpp-performance-changes-3n-dnv-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-dnv:
-        - 17  # MRR sel
-    vpp-performance-changes-3n-dnv-mrr-ref:
       csit-vpp-perf-verify-2001-3n-dnv:
         - 11  # MRR sel
+    vpp-performance-changes-3n-dnv-mrr-ref:
+      csit-vpp-perf-report-iterative-2009-3n-dnv:
+        - 19  # rls2005 MRR iter env 5
     vpp-performance-changes-3n-dnv-mrr-cmp:
-      csit-vpp-perf-report-iterative-2005-3n-dnv:
-        - 8   # MRR
+      csit-vpp-perf-report-iterative-2009-3n-dnv:
+        - 22  # rls2009 MRR iter env 5
 
     vpp-performance-changes-3n-tsh-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-tsh:
-        - 17  # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-ref:
       csit-vpp-perf-verify-2001-3n-tsh:
         - 9   # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-cmp:
+    vpp-performance-changes-3n-tsh-mrr-ref-env4:
       csit-vpp-perf-report-iterative-2005-3n-tsh:
-        - 10  # MRR sel
+        - 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:
+      csit-vpp-perf-report-iterative-2009-3n-tsh:
+        - 15  # rls2006 MRR iter env 5
 
     dpdk-performance-changes-3n-hsw-h1:
-      csit-dpdk-perf-verify-1908-3n-hsw:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-    dpdk-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-verify-2001-3n-hsw:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
-    dpdk-performance-changes-3n-hsw-cmp:
+    dpdk-performance-changes-3n-hsw-ref:
       csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 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
-        - 14  # NDRPDR sel
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
+    dpdk-performance-changes-3n-hsw-cmp:
+      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
 
     dpdk-performance-changes-3n-skx-h1:
-      csit-dpdk-perf-verify-1908-3n-skx:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-    dpdk-performance-changes-3n-skx-ref:
       csit-dpdk-perf-verify-2001-3n-skx:
         - 29  # NDRPDR sel xxv710
         - 33  # NDRPDR sel xxv710
         - 46  # NDRPDR sel x710
         - 47  # NDRPDR sel x710
         - 48  # NDRPDR sel x710
-    dpdk-performance-changes-3n-skx-cmp:
+    dpdk-performance-changes-3n-skx-ref:
       csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+        - 30  # NDRPDR iter
+        - 31  # NDRPDR iter
+        - 32  # NDRPDR iter
+        - 33  # NDRPDR iter
+        - 34  # NDRPDR iter
+        - 35  # NDRPDR iter
+        - 36  # NDRPDR iter
+        - 37  # NDRPDR iter
+    dpdk-performance-changes-3n-skx-cmp:
+      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
 
     dpdk-performance-changes-2n-skx-h1:
-      csit-dpdk-perf-verify-1908-2n-skx:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-    dpdk-performance-changes-2n-skx-ref:
       csit-dpdk-perf-verify-2001-2n-skx:
         - 35  # NDRPDR sel xxv710
         - 36  # NDRPDR sel xxv710
         - 50  # NDRPDR sel x710
         - 51  # NDRPDR sel x710
         - 54  # NDRPDR sel x710
-    dpdk-performance-changes-2n-skx-cmp:
+    dpdk-performance-changes-2n-skx-ref:
       csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-
-    dpdk-performance-changes-2n-clx-ref:
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+    dpdk-performance-changes-2n-skx-cmp:
+      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
+
+    dpdk-performance-changes-2n-clx-h1:
       csit-dpdk-perf-verify-2001-2n-clx:
         - 15  # NDRPDR sel
         - 16  # NDRPDR sel
         - 32  # NDRPDR sel
         - 33  # NDRPDR sel
         - 34  # NDRPDR sel
-    dpdk-performance-changes-2n-clx-cmp:
+    dpdk-performance-changes-2n-clx-ref:
       csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-
-    dpdk-performance-changes-2n-dnv-ref:
-      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
-    dpdk-performance-changes-2n-dnv-cmp:
-      csit-dpdk-perf-report-iterative-2005-2n-dnv:
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-
-    dpdk-performance-changes-3n-dnv-ref:
-      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
-    dpdk-performance-changes-3n-dnv-cmp:
-      csit-dpdk-perf-report-iterative-2005-3n-dnv:
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-
-    dpdk-performance-changes-3n-tsh-ref:
+        - 20  # NDRPDR iter
+        - 21  # NDRPDR iter
+        - 22  # NDRPDR iter
+        - 23  # NDRPDR iter
+        - 24  # NDRPDR iter
+        - 25  # NDRPDR iter
+        - 26  # NDRPDR iter
+        - 27  # NDRPDR iter
+        - 28  # NDRPDR iter
+        - 29  # NDRPDR iter
+    dpdk-performance-changes-2n-clx-cmp:
+      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
+
+#    dpdk-performance-changes-2n-dnv-h1:
+#      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
+#    dpdk-performance-changes-2n-dnv-ref:
+#      # No data
+#    dpdk-performance-changes-2n-dnv-cmp:
+#      # No data
+#      csit-dpdk-perf-report-iterative-2009-2n-dnv:
+
+#    dpdk-performance-changes-3n-dnv-h1:
+#      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
+#    dpdk-performance-changes-3n-dnv-ref:
+#      # No data
+#    dpdk-performance-changes-3n-dnv-cmp:
+#      # No data
+#      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
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
         - 18  # NDRPDR sel
-    dpdk-performance-changes-3n-tsh-cmp:
+    dpdk-performance-changes-3n-tsh-ref:
       csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
+    dpdk-performance-changes-3n-tsh-cmp:
+      # TODO: Add:
+      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
 
     # Compare testbeds
 
     vpp-compare-testbeds-ref:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
+      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
     vpp-compare-testbeds-cmp:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
+      # TODO: Add:
+      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
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
 
     vpp-compare-testbeds-skx-clx-ref:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
+      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
+        - 51  # rls2009 NDRPDR iter NAT44 env 5
+        - 52  # rls2009 NDRPDR iter NAT44 env 5
+        - 53  # rls2009 NDRPDR iter NAT44 env 5
+        - 54  # rls2009 NDRPDR iter NAT44 env 5
+        - 55  # rls2009 NDRPDR iter NAT44 env 5
+        - 56  # rls2009 NDRPDR iter NAT44 env 5
+        - 57  # rls2009 NDRPDR iter NAT44 env 5
+        - 58  # rls2009 NDRPDR iter NAT44 env 5
+        - 59  # rls2009 NDRPDR iter NAT44 env 5
+        - 60  # rls2009 NDRPDR iter NAT44 env 5
     vpp-compare-testbeds-skx-clx-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 32  # NDRPDR sel ???
-        - 33  # NDRPDR sel ???
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 51  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 36  # rls2009 NDRPDR iter env 5
+        - 38  # rls2009 NDRPDR iter env 5
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
+        - 41  # rls2009 NDRPDR iter env 5
+        - 42  # rls2009 NDRPDR iter env 5
+        - 64  # rls2009 NDRPDR iter env 5
+        - 65  # rls2009 NDRPDR iter env 5
+        - 66  # rls2009 NDRPDR iter env 5
+        - 67  # rls2009 NDRPDR iter env 5
 
     vpp-compare-testbeds-hsw-clx-ref:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
+      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
     vpp-compare-testbeds-hsw-clx-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 7   # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 32  # NDRPDR sel ???
-        - 33  # NDRPDR sel ???
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 51  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 36  # rls2009 NDRPDR iter env 5
+        - 38  # rls2009 NDRPDR iter env 5
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
+        - 41  # rls2009 NDRPDR iter env 5
+        - 42  # rls2009 NDRPDR iter env 5
+        - 64  # rls2009 NDRPDR iter env 5
+        - 65  # rls2009 NDRPDR iter env 5
+        - 66  # rls2009 NDRPDR iter env 5
+        - 67  # rls2009 NDRPDR iter env 5
 
     vpp-compare-testbeds-mrr-ref:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 13  # MRR
+      csit-vpp-perf-report-iterative-2009-3n-hsw:
+        - 23  # rls2009 MRR iter env 5
     vpp-compare-testbeds-mrr-cmp:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 6   # MRR sel
+      csit-vpp-perf-report-iterative-2009-3n-skx:
+        - 24  # rls2009 MRR iter env 5
 
     vpp-compare-testbeds-mrr-skx-clx-ref:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 42  # MRR sel
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 26  # rls2009 MRR iter env 5
     vpp-compare-testbeds-mrr-skx-clx-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 12   # MRR
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 78  # rls2009 MRR iter env 5
 
     vpp-compare-testbeds-mrr-hsw-clx-ref:
-      csit-vpp-perf-report-iterative-2005-3n-hsw:
-        - 13  # MRR
+      csit-vpp-perf-report-iterative-2009-3n-hsw:
+        - 23  # rls2009 MRR iter env 5
     vpp-compare-testbeds-mrr-hsw-clx-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-clx:
-        - 12   # MRR
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 78  # rls2009 MRR iter env 5
 
     dpdk-compare-testbeds-ref:
-      csit-dpdk-perf-report-iterative-2005-3n-hsw:
-        - 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
-        - 14  # NDRPDR sel
+      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
     dpdk-compare-testbeds-cmp:
-      csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
+      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
 
     dpdk-compare-testbeds-skx-clx-ref:
-      csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+      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
     dpdk-compare-testbeds-skx-clx-cmp:
-      csit-dpdk-perf-report-iterative-2005-2n-clx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+      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
 
     # Compare topologies
 
     vpp-compare-topologies-ref:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel ??? all x710 failed
-        - 33  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 41  # NDRPDR sel
+      # TODO: Add:
+      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
+        - 39  # rls2009 NDRPDR iter env 5
+        - 40  # rls2009 NDRPDR iter env 5
     vpp-compare-topologies-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 43  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 65  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 55  # NDRPDR sel
-        - 67  # NDRPDR sel
-        - 75  # NDRPDR sel
-        - 76  # NDRPDR sel
-        - 73  # NDRPDR sel
+      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
 
     vpp-compare-topologies-mrr-ref:
-      csit-vpp-perf-report-iterative-2005-3n-skx:
-        - 6   # MRR sel
+      csit-vpp-perf-report-iterative-2009-3n-skx:
+        - 24  # rls2009 MRR iter env 5
     vpp-compare-topologies-mrr-cmp:
-      csit-vpp-perf-report-iterative-2005-2n-skx:
-        - 42  # MRR sel
+      csit-vpp-perf-report-iterative-2009-2n-skx:
+        - 26  # rls2009 MRR iter env 5
 
     dpdk-compare-topologies-ref:
-      csit-dpdk-perf-report-iterative-2005-3n-skx:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
+      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
     dpdk-compare-topologies-cmp:
-      csit-dpdk-perf-report-iterative-2005-2n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
+      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
 
   plot-layouts:
 
     plot-soak-throughput:
       titlefont:
-        size: 18
+        size: 16
       xaxis:
         title: "<b>Test Cases [Index]</b>"
         titlefont:
-          size: 16
+          size: 14
         autorange: True
         fixedrange: False
         gridcolor: "rgb(230, 230, 230)"
         tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
         tickfont:
-          size: 16
+          size: 14
         zeroline: False
       yaxis:
         title: "<b>Critical Rate Lower Bound [Mpps]</b>"
         titlefont:
-          size: 16
+          size: 14
         gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4r"
         tickformat: ".3r"
         showticklabels: True
         tickcolor: "rgb(220, 220, 220)"
         tickfont:
-          size: 16
+          size: 14
         zeroline: False
         range: [0,50]
       autosize: False
       legend:
         orientation: "h"
         font:
-          size: 16
+          size: 14
       width: 700
       height: 900
       paper_bgcolor: "#fff"
 
     plot-service-density:
       titlefont:
-        size: 18
+        size: 16
       xaxis:
         side: "top"
         autorange: True
       hoverlabel:
         namelength: -1
 
-#    plot-cps:
-#      titlefont:
-#        size: 18
-#      xaxis:
-#        title: "<b>Test Cases [Index]</b>"
-#        titlefont:
-#          size: 16
-#        autorange: True
-#        fixedrange: False
-#        gridcolor: "rgb(230, 230, 230)"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickmode: "linear"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      yaxis:
-#        title: "<b>Connections Per Second [cps]</b>"
-#        titlefont:
-#          size: 16
-#        gridcolor: "rgb(230, 230, 230)"
-#        hoverformat: ".4s"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        rangemode: "tozero"
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickformat: ".3s"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      boxmode: "group"
-#      boxgroupgap: 0.5
-#      autosize: False
-#      margin:
-#        t: 50
-#        b: 20
-#        l: 80
-#        r: 20
-#      showlegend: True
-#      legend:
-#        orientation: "h"
-#        font:
-#          size: 16
-#      width: 700
-#      height: 800
-#      paper_bgcolor: "#fff"
-#      plot_bgcolor: "#fff"
-#      hoverlabel:
-#        namelength: -1
-#
-#    plot-rps:
-#      titlefont:
-#        size: 18
-#      xaxis:
-#        title: "<b>Test Cases [Index]</b>"
-#        titlefont:
-#          size: 16
-#        autorange: True
-#        fixedrange: False
-#        gridcolor: "rgb(230, 230, 230)"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(220, 220, 220)"
-#        tickmode: "linear"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      yaxis:
-#        title: "<b>Requests Per Second [rps]</b>"
-#        titlefont:
-#          size: 16
-#        gridcolor: "rgb(230, 230, 230)"
-#        hoverformat: ".4s"
-#        linecolor: "rgb(220, 220, 220)"
-#        linewidth: 1
-#        rangemode: "tozero"
-#        showgrid: True
-#        showline: True
-#        showticklabels: True
-#        tickcolor: "rgb(230, 230, 230)"
-#        tickformat: ".3s"
-#        tickfont:
-#          size: 16
-#        zeroline: False
-#      boxmode: "group"
-#      boxgroupgap: 0.5
-#      autosize: False
-#      margin:
-#        t: 50
-#        b: 20
-#        l: 80
-#        r: 20
-#      showlegend: True
-#      legend:
-#        orientation: "h"
-#        font:
-#          size: 16
-#      width: 700
-#      height: 800
-#      paper_bgcolor: "#fff"
-#      plot_bgcolor: "#fff"
-#      hoverlabel:
-#        namelength: -1
-
     plot-hoststack:
       titlefont:
         size: 16
         tickfont:
           size: 14
         zeroline: False
-      boxmode: "group"
-      boxgroupgap: 0.5
       autosize: False
       margin:
         t: 50
 
     plot-throughput:
       titlefont:
-        size: 18
+        size: 16
       xaxis:
         title: "<b>Test Cases [Index]</b>"
         titlefont:
-          size: 16
+          size: 14
         autorange: True
         fixedrange: False
         gridcolor: "rgb(230, 230, 230)"
         tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
         tickfont:
-          size: 16
+          size: 14
         zeroline: False
       yaxis:
         title: "<b>Packet Throughput [Mpps]</b>"
         titlefont:
-          size: 16
+          size: 14
         gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4r"
         tickformat: ".3r"
         showticklabels: True
         tickcolor: "rgb(220, 220, 220)"
         tickfont:
-          size: 16
+          size: 14
         zeroline: False
         range: [0,50]
       autosize: False
       legend:
         orientation: "h"
         font:
-          size: 16
+          size: 14
       width: 700
       height: 900
       paper_bgcolor: "#fff"
 
     plot-throughput-speedup-analysis:
       titlefont:
-        size: 18
+        size: 16
       xaxis:
         title: "<b>Number of Cores [Qty]</b>"
         titlefont:
-          size: 16
+          size: 14
         autorange: True
         fixedrange: False
         gridcolor: "rgb(230, 230, 230)"
         tickcolor: "rgb(238, 238, 238)"
         tickmode: "linear"
         tickfont:
-          size: 16
+          size: 14
         zeroline: False
       yaxis:
         title: "<b>Packet Throughput [Mpps]</b>"
         titlefont:
-          size: 16
+          size: 14
         type: "linear"
         gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
         tickcolor: "rgb(220, 220, 220)"
         tickformat: ".4s"
         tickfont:
-          size: 16
+          size: 14
         zeroline: True
         rangemode: "tozero"
         range: [0,100]
       legend:
         orientation: "h"
         font:
-          size: 16
+          size: 14
         xanchor: "left"
         yanchor: "top"
         x: 0
           xanchor: "left",
           yanchor: "top",
           x: 0,
-          y: -0.13,
+          y: -0.14,
           font: {
             family: "Consolas, Courier New",
-            size: 15
+            size: 13
           },
         },
         {
           y: -0.15,
           font: {
             family: "Consolas, Courier New",
-            size: 15
+            size: 13
           },
         },
       ]
 
     plot-latency:
       titlefont:
-        size: 18
+        size: 16
       xaxis:
         title: "<b>Direction</b>"
         titlefont:
-          size: 16
+          size: 14
         autorange: True
         fixedrange: False
         gridcolor: "rgb(230, 230, 230)"
         tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
         tickfont:
-          size: 16
+          size: 14
         zeroline: False
       yaxis:
         title: "<b>Packet Latency [uSec]</b>"
         titlefont:
-          size: 16
+          size: 14
         type: "linear"
         gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
         tickcolor: "rgb(220, 220, 220)"
         tickformat: ".4s"
         tickfont:
-          size: 16
+          size: 14
         zeroline: True
         rangemode: "tozero"
       legend:
         orientation: "h"
         font:
-          size: 16
+          size: 14
         traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
       autosize: False
       margin:
         xanchor: "center"
         x: 0.5
         font:
-          size: 18
+          size: 16
       xaxis:
         type: "log"
         title: "<b>Percentile [%]</b>"
         titlefont:
-          size: 16
+          size: 14
         autorange: True
         fixedrange: False
         gridcolor: "rgb(230, 230, 230)"
         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]
         tickfont:
-          size: 16
+          size: 14
       yaxis:
         title: "<b>Packet Latency [uSec]</b>"
         titlefont:
-          size: 16
+          size: 14
         gridcolor: "rgb(230, 230, 230)"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showticklabels: True
         tickcolor: "rgb(220, 220, 220)"
         tickfont:
-          size: 16
+          size: 14
       autosize: False
       showlegend: True
       legend:
         traceorder: "normal"
         orientation: "h"
         font:
-          size: 16
+          size: 14
         xanchor: "left"
         yanchor: "top"
         x: 0
 
   builds:
 
-    csit-vpp-perf-verify-1908-3n-hsw:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 39  # MRR sel
     csit-vpp-perf-verify-2001-3n-hsw:
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 32  # NDRPDR sel
-      - 34  # NDRPDR sel
       - 17  # MRR sel
     csit-vpp-perf-report-iterative-2005-3n-hsw:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel env 2
-      - 21  # NDRPDR sel env 2
-      - 22  # NDRPDR sel env 2
-      - 13  # MRR
-    csit-vpp-perf-verify-2005-3n-hsw:
-      - 3   # hoststack
-      - 5   # hoststack
-      - 6   # hoststack
-      - 7   # hoststack
-      - 8   # hoststack
-      - 9   # hoststack
-      - 10  # hoststack
-      - 11  # hoststack
-      - 12  # hoststack
-      - 13  # hoststack
-    csit-vpp-perf-report-coverage-2005-3n-hsw:
-      - 1   # perf-full-3n-dnv-crypto_I
-      - 7   # perf-full-3n-hsw-crypto_II
-      - 3   # perf-full-3n-hsw-crypto_III
-      - 4   # perf-full-3n-dnv-crypto_IV
-      - 5   # perf-full-3n-hsw-ip4_I
-      - 6   # perf-full-3n-hsw-ip4_II
-      - 8   # perf-full-3n-hsw-ip4_III
-      - 9   # perf-full-3n-hsw-ip4_IV
-      - 10  # perf-full-3n-hsw-ip4_V
-      - 26  # perf-full-3n-hsw-ip4_VI
-      - 18  # perf-full-3n-hsw-ip4_VII
-      - 27  # perf-full-3n-hsw-ip4_VIII
-      - 28  # perf-full-3n-hsw-ip4_IX
-      - 29  # perf-full-3n-hsw-ip6_I
-      - 35  # perf-full-3n-hsw-ip6_II
-      - 42  # perf-full-3n-hsw-l2_I
-      - 33  # perf-full-3n-hsw-l2_II
-      - 37  # perf-full-3n-hsw-l2_III
-      - 45  # perf-full-3n-hsw-l2_IV
-      - 43  # perf-full-3n-hsw-l2_V
-      - 40  # perf-full-3n-hsw-l2_VI
-      - 44  # perf-full-3n-hsw-l2_VII
-      - 51  # perf-full-3n-hsw-l2_VIII
-      - 50  # perf-full-3n-hsw-l2_IX
-      - 52  # perf-full-3n-hsw-l2_X
-      - 53  # perf-full-3n-hsw-l2_XI
-      - 54  # perf-full-3n-hsw-memif
-      - 55  # perf-full-3n-hsw-ip4tunnels-I
-      - 56  # perf-full-3n-hsw-ip4tunnels-II
-      - 57  # perf-full-3n-hsw-ip4tunnels-III
-      - 58  # perf-full-3n-hsw-ip6tunnels-I
-      - 59  # perf-full-3n-hsw-srv6-I
-      - 60  # perf-full-3n-hsw-srv6-II
-      - 61  # perf-full-3n-hsw-vhost-I
-      - 62  # perf-full-3n-hsw-vhost-II
-      - 63  # perf-full-3n-hsw-vhost-III
-
-    csit-vpp-perf-verify-1908_1-3n-skx:
-      - 26  # NDRPDR sel - new1908.1
-      - 27  # NDRPDR sel - new1908.1
-      - 28  # NDRPDR sel - new1908.1
-      - 29  # NDRPDR sel - new1908.1
-      - 30  # NDRPDR sel - new1908.1
-      - 31  # NDRPDR sel - new1908.1
-      - 33  # NDRPDR sel - new1908.1
-      - 34  # NDRPDR sel - new1908.1
-      - 35  # NDRPDR sel - new1908.1
-      - 36  # NDRPDR sel - new1908.1
+      - 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
+      - 10  # rls2005 NDRPDR iter env 5
+      - 11  # rls2005 NDRPDR iter env 5
+      - 12  # rls2005 NDRPDR iter env 5
+      - 13  # rls2005 NDRPDR iter env 5
+      - 14  # rls2005 NDRPDR iter env 5
+      - 15  # rls2005 NDRPDR iter env 5
+      - 16  # rls2005 NDRPDR iter env 5
+      - 17  # rls2005 NDRPDR iter env 5
+      - 19  # rls2005 NDRPDR iter env 5
+      - 23  # rls2009 MRR iter env 5
+      - 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
+      - 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:
-      - 69  # NDRPDR sel - new2001.0
-      - 71  # NDRPDR sel - new2001.0
-      - 72  # NDRPDR sel - new2001.0
-      - 76  # NDRPDR sel - new2001.0
-      - 77  # NDRPDR sel - new2001.0
-      - 78  # NDRPDR sel - new2001.0
-      - 80  # NDRPDR sel - new2001.0
       - 50  # MRR sel
       - 53  # MRR sel addition
     csit-vpp-perf-report-iterative-2005-3n-skx:
       - 33  # NDRPDR sel
       - 28  # NDRPDR sel
       - 34  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 37  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 6   # MRR sel
-    csit-vpp-perf-report-coverage-2005-3n-skx:
-      - 10  # perf-full-3n-skx-crypto_I
-      - 11  # perf-full-3n-skx-crypto_II
-      - 12  # perf-full-3n-skx-crypto_III
-      - 5   # perf-full-3n-skx-ip4_I
-      - 14  # perf-full-3n-skx-ip4_II
-      - 7   # perf-full-3n-skx-ip4_III
-      - 15  # perf-full-3n-skx-ip4_IV
-      - 16  # perf-full-3n-skx-ip4_V
-      - 17  # perf-full-3n-skx-ip4_VI
-      - 18  # perf-full-3n-skx-ip4_VII
-      - 19  # perf-full-3n-skx-ip4_VIII
-      - 20  # perf-full-3n-skx-ip4_IX
-      - 24  # perf-full-3n-skx-ip6_I
-      - 25  # perf-full-3n-skx-ip6_II
-      - 22  # perf-full-3n-skx-ip4tunnels-II
-      - 23  # perf-full-3n-skx-ip4tunnels-III
-      - 26  # perf-full-3n-skx-ip6tunnels-I
-      - 28  # perf-full-3n-skx-l2_II
-      - 29  # perf-full-3n-skx-l2_III
-      - 30  # perf-full-3n-skx-l2_IV
-      - 32  # perf-full-3n-skx-l2_VI
-      - 33  # perf-full-3n-skx-l2_VII
-      - 35  # perf-full-3n-skx-l2_IX
-      - 36  # perf-full-3n-skx-l2_X
-      - 37  # perf-full-3n-skx-l2_XI
-
-    csit-vpp-perf-verify-1908_1-2n-skx:
-      - 39  # NDRPDR sel - new1908.1
-      - 40  # NDRPDR sel - new1908.1
-      - 41  # NDRPDR sel - new1908.1
-      - 43  # NDRPDR sel - new1908.1
-      - 44  # NDRPDR sel - new1908.1
-      - 45  # NDRPDR sel - new1908.1
-      - 46  # NDRPDR sel - new1908.1
-      - 47  # NDRPDR sel - new1908.1
-      - 48  # NDRPDR sel - new1908.1
-      - 49  # NDRPDR sel - new1908.1
+      - 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
+    # TODO: Add:
+    csit-vpp-perf-report-iterative-2009-3n-skx:
+      - 17  # rls2005 MRR iter env 5
+      - 13  # rls2005 NDRPDR iter env 5
+      - 18  # rls2005 NDRPDR iter env 5
+      - 19  # rls2005 NDRPDR iter env 5
+      - 41  # rls2005 NDRPDR iter env 5
+      - 24  # rls2009 MRR 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
+      - 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
+    # TODO: Add:
+    csit-vpp-perf-report-coverage-2009-3n-skx:
+      - 9   # rls2009 NDRPDR cov 3n-skx-ip4-03
+      - 12  # rls2009 NDRPDR cov 3n-skx-ip4-06
+      - 16  # rls2009 NDRPDR cov 3n-skx-ip4tun-02
+
     csit-vpp-perf-verify-2001-2n-skx:
-      - 143  # NDRPDR sel - new2001.0
-      - 146  # NDRPDR sel - new2001.0
-      - 147  # NDRPDR sel - new2001.0
-      - 148  # NDRPDR sel - new2001.0
-      - 149  # NDRPDR sel - new2001.0
-      - 150  # NDRPDR sel - new2001.0
-      - 151  # NDRPDR sel - new2001.0
-      - 152  # NDRPDR sel - new2001.0
-      - 153  # NDRPDR sel - new2001.0
-      - 154  # NDRPDR sel - new2001.0
       - 101  # MRR sel - old
       - 128  # MRR sel addition - old
     csit-vpp-perf-report-iterative-2005-2n-skx:
-      - 43  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 65  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 55  # NDRPDR sel
-      - 67  # NDRPDR sel
-      - 75  # NDRPDR sel
-      - 76  # NDRPDR sel
-      - 73  # NDRPDR sel
-      - 88  # NDRPDR sel env 2
-      - 42  # MRR sel
-      - 48  # Reconf
-      - 50  # Reconf
-      - 51  # Reconf
-      - 52  # Reconf
-      - 53  # Reconf
-      - 60  # Reconf
-      - 70  # Reconf
-      - 71  # Reconf
-      - 63  # Reconf
-      - 66  # Reconf
-      - 49  # Soak
-      - 54  # Soak
-      - 83  # nf-density-sel
-    csit-vpp-perf-report-coverage-2005-2n-skx:
-      - 11  # perf-full-2n-skx-ip4_I
-      - 3   # perf-full-2n-skx-ip4_II
-      - 18  # perf-full-2n-skx-ip4_III
-      - 19  # perf-full-2n-skx-ip4_IV
-      - 5   # perf-full-2n-skx-ip4_V
-      - 20  # perf-full-2n-skx-ip4_VI
-      - 7   # perf-full-2n-skx-ip6_I
-      - 21  # perf-full-2n-skx-ip6_II
-      - 9   # perf-full-2n-skx-l2_I
-      - 22  # perf-full-2n-skx-l2_II
-      - 23  # perf-full-2n-skx-memif
-      - 24  # perf-full-2n-skx-loadbalancer
-      - 25  # perf-full-2n-skx-vhost I
-      - 26  # perf-full-2n-skx-vhost II
-      - 27  # perf-full-2n-skx-vts
-
-    csit-vpp-perf-verify-1908_1-2n-clx:
-      - 5  # NDRPDR sel
-      - 6  # NDRPDR sel
-      - 7  # NDRPDR sel
-      - 8  # NDRPDR sel
-      - 9  # NDRPDR sel
+      - 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-2009-2n-skx:
+      - 20  # rls2005 MRR iter env 5
+      - 13  # rls2005 NDRPDR iter env 5
+      - 16  # rls2005 NDRPDR iter env 5
+      - 17  # rls2005 NDRPDR iter env 5
+      - 18  # rls2005 NDRPDR iter env 5
+      - 19  # rls2005 NDRPDR iter env 5
+      - 21  # rls2005 NDRPDR iter env 5
+      - 22  # rls2005 NDRPDR iter env 5
+      - 23  # rls2005 NDRPDR iter env 5
+      - 24  # rls2005 NDRPDR iter env 5
+      - 25  # rls2005 NDRPDR iter env 5
+      - 26  # rls2009 MRR iter env 5
+      - 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
+      - 51  # rls2009 NDRPDR iter NAT44 env 5
+      - 52  # rls2009 NDRPDR iter NAT44 env 5
+      - 53  # rls2009 NDRPDR iter NAT44 env 5
+      - 54  # rls2009 NDRPDR iter NAT44 env 5
+      - 55  # rls2009 NDRPDR iter NAT44 env 5
+      - 56  # rls2009 NDRPDR iter NAT44 env 5
+      - 57  # rls2009 NDRPDR iter NAT44 env 5
+      - 58  # rls2009 NDRPDR iter NAT44 env 5
+      - 59  # rls2009 NDRPDR iter NAT44 env 5
+      - 60  # 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
+      - 13  # rls2009 NDRPDR cov 2n-skx-ip4-05
+      - 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:
-      - 28  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 32  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 45  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-      - 49  # NDRPDR sel
       - 39  # MRR
     csit-vpp-perf-report-iterative-2005-2n-clx:
-      - 7   # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 32  # NDRPDR sel ???
-      - 33  # NDRPDR sel ???
-      - 39  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 50  # NDRPDR sel
-      - 51  # NDRPDR sel
-      - 62  # NDRPDR sel env 2
-      - 63  # NDRPDR sel env 2
-      - 12  # MRR
-      - 42  # Reconf
-      - 45  # Reconf
-      - 46  # Reconf
-      - 47  # Reconf
-      - 48  # Reconf
-      - 52  # Reconf
-      - 53  # Reconf
-      - 54  # Reconf
-      - 55  # Reconf
-      - 56  # Reconf
-      - 44  # Soak
-      - 49  # Soak
-      - 57  # 2n-clx nfv-density-00
-      - 58  # 2n-clx nfv-density-00
-      - 59  # 2n-clx nfv-density-00
-      - 60  # 2n-clx nfv-density-00
-      - 61  # 2n-clx nfv-density-00
-    csit-vpp-perf-report-coverage-2005-2n-clx:
-      - 21  # perf-full-2n-clx-ip4_I
-      - 2   # perf-full-2n-clx-ip4_II
-      - 3   # perf-full-2n-clx-ip4_III
-      - 4   # perf-full-2n-clx-ip4_IV
-      - 5   # perf-full-2n-clx-ip4_V
-      - 6   # perf-full-2n-clx-ip4_VI
-      - 7   # perf-full-2n-clx-ip6_I
-      - 16  # perf-full-2n-clx-ip6_II
-      - 23  # perf-full-2n-clx-l2_I
-      - 10  # perf-full-2n-clx-l2_II
-      - 11  # perf-full-2n-clx-memif
-      - 12  # perf-full-2n-clx-loadbalancer
-      - 13  # perf-full-2n-clx-vhost I
-      - 22  # perf-full-2n-clx-vhost II
-      - 15  # perf-full-2n-clx-vts
-
-    csit-vpp-perf-verify-1908-3n-tsh:
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # MRR sel
+      - 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-2009-2n-clx:
+      - 77  # rls2005 MRR iter env 5
+      - 13  # rls2005 NDRPDR iter env 5
+      - 15  # rls2005 NDRPDR iter env 5
+      - 17  # rls2005 NDRPDR iter env 5
+      - 18  # rls2005 NDRPDR iter env 5
+      - 19  # rls2005 NDRPDR iter env 5
+      - 20  # rls2005 NDRPDR iter env 5
+      - 21  # rls2005 NDRPDR iter env 5
+      - 22  # rls2005 NDRPDR iter env 5
+      - 23  # rls2005 NDRPDR iter env 5
+      - 24  # rls2005 NDRPDR iter env 5
+      - 78  # rls2009 MRR iter env 5
+      - 36  # rls2009 NDRPDR iter env 5
+      - 38  # rls2009 NDRPDR iter env 5
+      - 39  # rls2009 NDRPDR iter env 5
+      - 40  # rls2009 NDRPDR iter env 5
+      - 41  # rls2009 NDRPDR iter env 5
+      - 42  # rls2009 NDRPDR iter env 5
+      - 64  # rls2009 NDRPDR iter env 5
+      - 65  # rls2009 NDRPDR iter env 5
+      - 66  # rls2009 NDRPDR iter env 5
+      - 67  # rls2009 NDRPDR iter 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
+    # TODO: Add:
+    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
+      - 7   # rls2009 NDRPDR cov 2n-clx-ip4-05
+      - 8   # 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-verify-2001-3n-tsh:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 21  # NDRPDR sel
       - 9   # MRR sel
-    # TODO: Add data:
     csit-vpp-perf-report-iterative-2005-3n-tsh:
-      - 9   # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 10  # MRR sel
+      - 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
+    # TODO: Add:
+    csit-vpp-perf-report-iterative-2009-3n-tsh:
+      - 8   # rls2005 NDRPDR iter env 5
+      - 11  # rls2005 NDRPDR iter env 5
+      - 12  # rls2005 NDRPDR iter env 5
+      - 13  # rls2005 MRR iter env 5
+      - 14  # rls2009 NDRPDR iter env 5
+      - 20  # rls2009 NDRPDR iter env 5
+      - 22  # rls2009 NDRPDR iter env 5
+      - 23  # rls2009 NDRPDR iter env 5
+      - 15  # rls2006 MRR iter env 5
+#    csit-vpp-perf-report-coverage-2009-3n-tsh:
+#      -
 
-    csit-vpp-perf-verify-1908-3n-dnv:
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # MRR sel
     csit-vpp-perf-verify-2001-3n-dnv:
       - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 17  # NDRPDR sel
       - 18  # NDRPDR sel
       - 11  # MRR sel
-    csit-vpp-perf-report-iterative-2005-3n-dnv:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 8   # MRR
-    csit-vpp-perf-report-coverage-2005-3n-dnv:
-      - 1   # perf-full-3n-dnv-crypto_I
-      - 24  # perf-full-3n-dnv-crypto_II
-      - 5   # perf-full-3n-dnv-ip4_I
-      - 13  # perf-full-3n-dnv-ip4_II
-      - 17  # perf-full-3n-dnv-ip6_I
-      - 18  # perf-full-3n-dnv-ip6_II
-      - 21  # perf-full-3n-dnv-l2_I
-      - 22  # perf-full-3n-dnv-l2_II
-      - 23  # perf-full-3n-dnv-ip4-tunnels_I
-
-    csit-vpp-perf-verify-1908-2n-dnv:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # MRR sel
+    csit-vpp-perf-report-iterative-2009-3n-dnv:
+      - 16  # rls2005 NDRPDR iter env 5
+      - 23  # rls2005 NDRPDR iter env 5
+      - 25  # rls2005 NDRPDR iter env 5
+      - 26  # rls2005 NDRPDR iter env 5
+      - 27  # rls2005 NDRPDR iter env 5
+      - 28  # rls2005 NDRPDR iter env 5
+      - 29  # rls2005 NDRPDR iter env 5
+      - 30  # rls2005 NDRPDR iter env 5
+      - 31  # rls2005 NDRPDR iter env 5
+      - 32  # rls2005 NDRPDR iter env 5
+      - 19  # rls2005 MRR iter env 5
+      - 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
+      - 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
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel
       - 12  # MRR sel
-    csit-vpp-perf-report-iterative-2005-2n-dnv:
-      - 3   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # MRR sel
-    csit-vpp-perf-report-coverage-2005-2n-dnv:
-      - 1   # perf-full-2n-dnv-ip4_I
-      - 2   # perf-full-2n-dnv-ip4_II
-      - 3   # perf-full-2n-dnv-ip6_I
-      - 4   # perf-full-2n-dnv-ip6_II
-      - 5   # perf-full-2n-dnv-l2_I
-      - 6   # perf-full-2n-dnv-l2_II
-
-    csit-dpdk-perf-verify-1908-3n-hsw:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-    csit-dpdk-perf-verify-2001-3n-hsw:
+    csit-vpp-perf-report-iterative-2009-2n-dnv:
+      - 16  # rls2005 NDRPDR iter env 5
+      - 17  # rls2005 NDRPDR iter env 5
+      - 18  # rls2005 NDRPDR iter env 5
+      - 19  # rls2005 NDRPDR iter env 5
+      - 21  # rls2005 NDRPDR iter env 5
+      - 24  # rls2005 NDRPDR iter env 5
+      - 27  # rls2005 NDRPDR iter env 5
+      - 28  # rls2005 NDRPDR iter env 5
+      - 29  # rls2005 NDRPDR iter env 5
+      - 30  # rls2005 NDRPDR iter env 5
+      - 23  # rls2005 MRR iter env 5
+      - 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
+      - 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
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-3n-hsw:
-      - 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
-      - 14  # NDRPDR sel
+      - 25  # NDRPDR iter
+      - 26  # NDRPDR iter
+      - 27  # NDRPDR iter
+      - 28  # NDRPDR iter
+      - 29  # NDRPDR iter
+      - 30  # NDRPDR iter
+      - 31  # NDRPDR iter
+      - 32  # NDRPDR iter
+      - 33  # NDRPDR iter
+      - 34  # NDRPDR iter
+    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-verify-1908-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
     csit-dpdk-perf-verify-2001-3n-skx:
       - 29  # NDRPDR sel xxv710
       - 33  # NDRPDR sel xxv710
       - 47  # NDRPDR sel x710
       - 48  # NDRPDR sel x710
     csit-dpdk-perf-report-iterative-2005-3n-skx:
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
+      - 28  # NDRPDR iter
+      - 29  # NDRPDR iter
+      - 30  # NDRPDR iter
+      - 31  # NDRPDR iter
+      - 32  # NDRPDR iter
+      - 33  # NDRPDR iter
+      - 34  # NDRPDR iter
+      - 35  # NDRPDR iter
+      - 36  # NDRPDR iter
+      - 37  # NDRPDR iter
+    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-verify-1908-2n-skx:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
     csit-dpdk-perf-verify-2001-2n-skx:
       - 35  # NDRPDR sel xxv710
       - 36  # NDRPDR sel xxv710
       - 51  # NDRPDR sel x710
       - 54  # NDRPDR sel x710
     csit-dpdk-perf-report-iterative-2005-2n-skx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
+      - 20  # NDRPDR iter
+      - 21  # NDRPDR iter
+      - 22  # NDRPDR iter
+      - 23  # NDRPDR iter
+      - 24  # NDRPDR iter
+      - 25  # NDRPDR iter
+      - 26  # NDRPDR iter
+      - 27  # NDRPDR iter
+      - 28  # NDRPDR iter
+      - 29  # NDRPDR iter
+    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-verify-2001-2n-clx:
       - 15  # NDRPDR sel
       - 33  # NDRPDR sel
       - 34  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-2n-clx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-
-    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:
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-
-    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:
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
+      - 20  # NDRPDR iter
+      - 21  # NDRPDR iter
+      - 22  # NDRPDR iter
+      - 23  # NDRPDR iter
+      - 24  # NDRPDR iter
+      - 25  # NDRPDR iter
+      - 26  # NDRPDR iter
+      - 27  # NDRPDR iter
+      - 28  # NDRPDR iter
+      - 29  # NDRPDR iter
+    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-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
       - 18  # NDRPDR sel
     csit-dpdk-perf-report-iterative-2005-3n-tsh:
       - 5   # NDRPDR sel
-
-    csit-vpp-device-2005-ubuntu1804-1n-skx:
-      - 35
+    # TODO: Add:
+    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
+
+    csit-vpp-device-2009-ubuntu1804-1n-skx:
+      - 131 # rls2009 env 5
 
 - type: "output"
   output: "report"
   format:
     html:
     - full
-#    pdf:
-#    - minimal
+    pdf:
+    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 
 ################################################################################
 
-# VPP Compare NICs 3n-skx 2t1c ndr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
-
-# VPP Compare NICs 3n-skx 4t2c ndr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
-
-# VPP Compare NICs 3n-skx 2t1c pdr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
-
-# VPP Compare NICs 3n-skx 4t2c pdr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx"
-      tag: "NIC_Intel-XXV710"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "x710, xxv710 - NICs tested."
-    - "Diff - difference between x710 and xxv710 NIC."
+## VPP Compare NICs 3n-skx 2t1c ndr
+#- type: "table"
+#  title: "VPP Compare NICs 3n-skx 2t1c ndr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
+#  columns:
+#    - title: "x710"
+#      data-set: "vpp-nic-comparison-3n-skx"
+#      tag: "NIC_Intel-X710"
+#    - title: "xxv710"
+#      data-set: "vpp-nic-comparison-3n-skx"
+#      tag: "NIC_Intel-XXV710"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 1
+#      compare: 2
+#  legend:
+#    - ""
+#    - "x710, xxv710 - NICs tested."
+#    - "Diff - difference between x710 and xxv710 NIC."
+#
+## VPP Compare NICs 3n-skx 4t2c ndr
+#- type: "table"
+#  title: "VPP Compare NICs 3n-skx 4t2c ndr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
+#  columns:
+#    - title: "x710"
+#      data-set: "vpp-nic-comparison-3n-skx"
+#      tag: "NIC_Intel-X710"
+#    - title: "xxv710"
+#      data-set: "vpp-nic-comparison-3n-skx"
+#      tag: "NIC_Intel-XXV710"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 1
+#      compare: 2
+#  legend:
+#    - ""
+#    - "x710, xxv710 - NICs tested."
+#    - "Diff - difference between x710 and xxv710 NIC."
+#
+## VPP Compare NICs 3n-skx 2t1c pdr
+#- type: "table"
+#  title: "VPP Compare NICs 3n-skx 2t1c pdr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
+#  columns:
+#    - title: "x710"
+#      data-set: "vpp-nic-comparison-3n-skx"
+#      tag: "NIC_Intel-X710"
+#    - title: "xxv710"
+#      data-set: "vpp-nic-comparison-3n-skx"
+#      tag: "NIC_Intel-XXV710"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 1
+#      compare: 2
+#  legend:
+#    - ""
+#    - "x710, xxv710 - NICs tested."
+#    - "Diff - difference between x710 and xxv710 NIC."
+#
+## VPP Compare NICs 3n-skx 4t2c pdr
+#- type: "table"
+#  title: "VPP Compare NICs 3n-skx 4t2c pdr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
+#  columns:
+#    - title: "x710"
+#      data-set: "vpp-nic-comparison-3n-skx"
+#      tag: "NIC_Intel-X710"
+#    - title: "xxv710"
+#      data-set: "vpp-nic-comparison-3n-skx"
+#      tag: "NIC_Intel-XXV710"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 1
+#      compare: 2
+#  legend:
+#    - ""
+#    - "x710, xxv710 - NICs tested."
+#    - "Diff - difference between x710 and xxv710 NIC."
 
 ## VPP Compare NICs 3n-skx 2t1c mrr
 #- type: "table"
 #      reference: 1
 #      compare: 2
 #  legend:
-#    - "Legend to Table:"
+#    - ""
 #    - "x710, xxv710 - NICs tested."
 #    - "Diff - difference between x710 and xxv710 NIC."
 #
 #      reference: 1
 #      compare: 2
 #  legend:
-#    - "Legend to Table:"
+#    - ""
 #    - "x710, xxv710 - NICs tested."
 #    - "Diff - difference between x710 and xxv710 NIC."
 #
 #      reference: 1
 #      compare: 2
 #  legend:
-#    - "Legend to Table:"
+#    - ""
 #    - "x710, xxv710 - NICs tested."
 #    - "Diff - difference between x710 and xxv710 NIC."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table:"
+    - ""
     - "x710, xxv710 - NICs tested."
     - "Diff - difference between x710 and xxv710 NIC."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table:"
+    - ""
     - "x710, xxv710 - NICs tested."
     - "Diff - difference between x710 and xxv710 NIC."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table:"
+    - ""
     - "x710, xxv710 - NICs tested."
     - "Diff - difference between x710 and xxv710 NIC."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table:"
+    - ""
     - "x710, xxv710 - NICs tested."
     - "Diff - difference between x710 and xxv710 NIC."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table:"
+    - ""
     - "x710, xxv710 - NICs tested."
     - "Diff - difference between x710 and xxv710 NIC."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table:"
+    - ""
     - "x710, xxv710 - NICs tested."
     - "Diff - difference between x710 and xxv710 NIC."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table:"
+    - ""
     - "x710, xxv710 - NICs tested."
     - "Diff - difference between x710 and xxv710 NIC."
 
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "Diff1"
-      reference: 3
-      compare: 4
-    - title: "Diff2"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-3n-hsw-1t1c-pdr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-3n-hsw-1t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-1t1c-pdr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "Diff1"
-      reference: 3
-      compare: 4
-    - title: "Diff2"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-3n-hsw-2t2c-pdr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-3n-hsw-2t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-2t2c-pdr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-hsw with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "Diff1"
-      reference: 3
-      compare: 4
-    - title: "Diff2"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-3n-hsw-1t1c-ndr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-3n-hsw-1t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-1t1c-ndr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
   comparisons:
-    - title: "Diff1"
-      reference: 3
-      compare: 4
-    - title: "Diff2"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-3n-hsw-2t2c-ndr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-3n-hsw-2t2c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-2t2c-ndr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
-
-## VPP Performance Changes 3n-skx 2t1c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-skx 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-skx-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-skx-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-skx-2t1c-pdr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-skx-2t1c-pdr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-skx 4t2c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-skx 4t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-skx-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-skx-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-skx-4t2c-pdr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-skx-4t2c-pdr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-skx 2t1c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-skx 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-skx-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-skx-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-skx-2t1c-ndr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-skx-2t1c-ndr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-skx 4t2c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-skx 4t2c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-skx-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-skx-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-skx-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-hsw with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 3n-skx 2t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2001.0-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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
+  comparisons:
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      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 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.'
+
+# VPP Performance Changes 3n-skx 4t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2001.0-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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
+  comparisons:
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-skx-4t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      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 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.'
+
+# VPP Performance Changes 3n-skx 2t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2001.0-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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
+  comparisons:
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      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 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.'
+
+# VPP Performance Changes 3n-skx 4t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-skx 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2001.0-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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-skx-cmp"
+  comparisons:
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-skx-4t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      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 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.'
 
 # 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: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "Diff1"
-      reference: 3
-      compare: 4
-    - title: "Diff2"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-2n-skx-2t1c-pdr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-2n-skx-2t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "Diff1"
-      reference: 3
-      compare: 4
-    - title: "Diff2"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-2n-skx-4t2c-pdr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-2n-skx-4t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-4t2c-pdr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "Diff1"
-      reference: 3
-      compare: 4
-    - title: "Diff2"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-2n-skx-2t1c-ndr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-2n-skx-2t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908.1-2"
+    - title: "2001.0-4"
       data-set: "vpp-performance-changes-2n-skx-h1"
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-skx-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-cmp"
   comparisons:
-    - title: "Diff1"
-      reference: 3
-      compare: 4
-    - title: "Diff2"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-2n-skx-4t2c-ndr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-2n-skx-4t2c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-4t2c-ndr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "Diff1"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-    - title: "Diff2"
-      reference: 1
-      compare: 2
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-2n-clx-2t1c-pdr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-2n-clx-2t1c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-2t1c-pdr-rca1.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "Diff1"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-    - title: "Diff2"
-      reference: 1
-      compare: 2
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-2n-clx-4t2c-pdr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-2n-clx-4t2c-pdr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-4t2c-pdr-rca1.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "Diff1"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-    - title: "Diff2"
-      reference: 1
-      compare: 2
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-2n-clx-2t1c-ndr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-2n-clx-2t1c-ndr-rca2.yaml"
+#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-2t1c-ndr-rca1.yaml"
   legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001.0-2"
-      data-set: "vpp-performance-changes-2n-clx-ref"
-    - title: "2005.0-2"
-      data-set: "vpp-performance-changes-2n-clx-cmp-2"
-    - title: "2005.0-3"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-cmp"
   comparisons:
-    - title: "Diff1"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
-    - title: "Diff2"
-      reference: 1
-      compare: 2
-#  rca:
-#    - title: "RCA1"
-#      data: "rca/rca-2005-2n-clx-4t2c-ndr-rca1.yaml"
-#    - title: "RCA2"
-#      data: "rca/rca-2005-2n-clx-4t2c-ndr-rca2.yaml"
-  legend:
-    - "Legend to Table"
-    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-#    - 'RCA1 - root cause analysis reference for Diff1.'
-#    - 'RCA2 - root cause analysis reference for Diff2.'
-
-# 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"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
-
-# 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"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
-
-# 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"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
-
-# 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"
-    - title: "2005.0-3"
-      data-set: "vpp-performance-changes-2n-clx-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-4t2c-ndr-rca1.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+
+## VPP Performance Changes 2n-clx-x556 2t1c pdr
+#- type: "table"
+#  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-dnv 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-dnv-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-2n-dnv-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-dnv-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-2n-dnv-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-dnv-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-2n-dnv-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-dnv-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-2n-dnv-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-dnv-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-3n-dnv-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-dnv-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-3n-dnv-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-dnv-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-3n-dnv-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-dnv-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-3n-dnv-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
-## VPP Performance Changes 3n-tsh 1t1c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-tsh 1t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-tsh-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-tsh-1t1c-pdr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-tsh-1t1c-pdr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-tsh 2t2c pdr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-tsh 2t2c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-pdr"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-tsh-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-tsh-2t2c-pdr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-tsh-2t2c-pdr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-tsh 1t1c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-tsh 1t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'1T1C'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-tsh-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-tsh-1t1c-ndr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-tsh-1t1c-ndr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
-#
-## VPP Performance Changes 3n-tsh 2t2c ndr
-#- type: "table"
-#  title: "VPP Performance Changes 3n-tsh 2t2c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T2C'"
-#  columns:
-#    - title: "1908.1-2"
-#      data-set: "vpp-performance-changes-3n-tsh-h1"
-#    - title: "2001.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-ref"
-#    - title: "2005.0-2"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
-#    - title: "2005.0-3"
-#      data-set: "vpp-performance-changes-3n-tsh-cmp"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 3
-#      compare: 4
-#    - title: "Diff2"
-#      reference: 2
-#      compare: 3
-##  rca:
-##    - title: "RCA1"
-##      data: "rca/rca-2005-3n-tsh-2t2c-ndr-rca1.yaml"
-##    - title: "RCA2"
-##      data: "rca/rca-2005-3n-tsh-2t2c-ndr-rca2.yaml"
-#  legend:
-#    - "Legend to Table"
-#    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-XX-XX).'
-#    - 'Diff1 - difference between environment versions "2" and "3" for the same VPP version, 2005.0-2 vs. 2005.0-3.'
-#    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2005.0-2 vs. 2001.0-2.'
-##    - 'RCA1 - root cause analysis reference for Diff1.'
-##    - 'RCA2 - root cause analysis reference for Diff2.'
+# VPP Performance Changes 3n-tsh 1t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-tsh 1t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-pdr"
+  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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
+  comparisons:
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-1t1c-pdr-rca2.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 3n-tsh 2t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 3n-tsh 2t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-pdr"
+  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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
+  comparisons:
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-2t2c-pdr-rca2.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: PDR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 3n-tsh 1t1c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-tsh 1t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-1t1c-ndr"
+  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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
+  comparisons:
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-1t1c-ndr-rca2.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+
+# VPP Performance Changes 3n-tsh 2t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 3n-tsh 2t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-tsh-2t2c-ndr"
+  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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-3n-tsh-cmp"
+  comparisons:
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-2t2c-ndr-rca2.yaml"
+  legend:
+    - ''
+    - 'Test Case:            Test cases executed for: NDR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 - type: "table"
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-1t1c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
+#      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-2t2c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-hsw 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
+#      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-hsw-4t4c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-hsw with xl710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 2t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-#    - title: "1908"
-#      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - 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"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-2t1c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 4t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-#    - title: "1908"
-#      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - 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"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-4t2c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-skx 8t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-#    - title: "1908"
-#      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - 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"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-3n-hsw-8t4c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 2t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-#    - title: "1908"
-#      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-4"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-2t1c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 4t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-#    - title: "1908"
-#      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-4"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-4t2c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-skx 8t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-#    - title: "1908"
-#      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-4"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-skx-8t4c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-skx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 2t1c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-2t1c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 4t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-4t2c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 2n-clx-xxv710 8t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2005.0-5 vs 2005.0-4"
+      reference: 2
+      compare: 3
+#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-2n-clx-8t4c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-clx with xxv710.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
+
+## VPP Performance Changes 2n-clx-x556 2t1c mrr
+#- type: "table"
+#  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-clx-clx-x556 2t1c mrr
+# VPP Performance Changes 2n-dnv 1t1c mrr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-clx-x556 2t1c mrr"
+  title: "VPP Performance Changes 2n-dnv 1t1c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-clx-x556-2t1c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
+  filter: "'1T1C'"
   columns:
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+    - 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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-clx-x556 4t2c mrr
+# VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-clx-x556 4t2c mrr"
+  title: "VPP Performance Changes 2n-dnv 2t2c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-clx-x556-4t2c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
+  filter: "'2T2C'"
   columns:
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+    - 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"
+    - title: "2009.0-5"
+      data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
-# VPP Performance Changes 2n-clx-clx-x556 8t4c mrr
+# VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
-  title: "VPP Performance Changes 2n-clx-clx-x556 8t4c mrr"
+  title: "VPP Performance Changes 2n-dnv 4t4c mrr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-clx-x556-8t4c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR' and 'NIC_Mellanox-CX556A' and not 'NF_DENSITY'"
+  filter: "'4T4C'"
   columns:
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-clx-mrr-ref"
-    - title: "2005"
-      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
-
-# VPP Performance Changes 2n-dnv 1t1c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 1t1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-1t1c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C'"
-  columns:
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
-    - title: "2005"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
-
-# VPP Performance Changes 2n-dnv 2t2c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 2t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-2t2c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C'"
-  columns:
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
-    - title: "2005"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
-
-# VPP Performance Changes 2n-dnv 4t4c mrr
-- type: "table"
-  title: "VPP Performance Changes 2n-dnv 4t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-dnv-4t4c-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T4C'"
-  columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-dnv-mrr-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-2n-dnv-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 2n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.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: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.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: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.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: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
-    - title: "2001"
+    - title: "2005.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
-    - title: "2005"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2009.0-5 vs 2005.0-5"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-dnv with x553.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2009.0-5 vs 2005.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: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
+#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-1t1c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
+#      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-2t2c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C'"
   columns:
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
-    - title: "2001"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
-    - title: "2005"
+    - 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"
+    - title: "2009.0-5"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
-    - title: "Diff"
+    - title: "2005.0-5 vs 2005.0-4"
       reference: 2
       compare: 3
+#      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca1.yaml"
+    - title: "2009.0-5 vs 2005.0-5"
+      reference: 3
+      compare: 4
+#      rca-file: "rca/rca-3n-tsh-4t4c-mrr-rca2.yaml"
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
+    - ''
+    - 'Test Case:            Test cases executed for: MRR throughput on 3n-tsh with x520.'
+    - 'YYMM.V-E:             [Mpps +- StDev] results for VPP (YY year, MM month, V minor version) tested in CSIT (E environment version, "2" for CSIT rls2001, "4" for CSIT rls2005).'
+    - 'YYMM.V-E vs YYMM.V-E: [% +- StDev] Relative difference, latter is the base. [N] for Root Cause Analysis (RCA) reference, see RCA list below.'
+    - '2005.0-5 vs 2005.0-4: Compares CSIT environment current vs previous with previous VPP code.'
+    - '2009.0-5 vs 2005.0-5: Compares VPP code current vs previous in the current CSIT environment.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
 - type: "table"
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 3n-skx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 3n-skx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw xl710, 2n-clx xxv710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw xl710 and 2n-clx xxv710 testbeds."
 
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 2t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 1t1c pdr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-hsw 2t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-skx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 2t1c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-skx 4t2c ndr
 - type: "table"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
-    - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       reference: 2
       compare: 3
   legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c pdr
 - type: "table"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 2t1c ndr
 - type: "table"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 2n-clx 4t2c ndr
 - type: "table"
   filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-clx-ref"
+      data-set: "dpdk-performance-changes-2n-clx-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-2n-clx-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
+
+## DPDK Performance Changes 2n-dnv 1t1c pdr
+#- type: "table"
+#  title: "DPDK Performance Changes 2n-dnv 1t1c pdr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-1t1c-pdr"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
+#  columns:
+#    - title: "2001"
+#      data-set: "dpdk-performance-changes-2n-dnv-h1"
+#    - title: "2005"
+#      data-set: "dpdk-performance-changes-2n-dnv-ref"
+#    - title: "2009"
+#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 2
+#      compare: 3
+#  legend:
+#    - ""
+#    - "2001, 2005, 2009 - DPDK versions tested."
+#    - "Diff - difference between 2005 and 2009 DPDK version."
+#
+## DPDK Performance Changes 2n-dnv 2t2c pdr
+#- type: "table"
+#  title: "DPDK Performance Changes 2n-dnv 2t2c pdr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-pdr"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
+#  columns:
+#    - title: "2001"
+#      data-set: "dpdk-performance-changes-2n-dnv-h1"
+#    - title: "2005"
+#      data-set: "dpdk-performance-changes-2n-dnv-ref"
+#    - title: "2009"
+#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 2
+#      compare: 3
+#  legend:
+#    - ""
+#    - "2001, 2005, 2009 - DPDK versions tested."
+#    - "Diff - difference between 2005 and 2009 DPDK version."
+#
+## DPDK Performance Changes 2n-dnv 1t1c ndr
+#- type: "table"
+#  title: "DPDK Performance Changes 2n-dnv 1t1c ndr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-1t1c-ndr"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
+#  columns:
+#    - title: "2001"
+#      data-set: "dpdk-performance-changes-2n-dnv-h1"
+#    - title: "2005"
+#      data-set: "dpdk-performance-changes-2n-dnv-ref"
+#    - title: "2009"
+#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 2
+#      compare: 3
+#  legend:
+#    - ""
+#    - "2001, 2005, 2009 - DPDK versions tested."
+#    - "Diff - difference between 2005 and 2009 DPDK version."
+#
+## DPDK Performance Changes 2n-dnv 2t2c ndr
+#- type: "table"
+#  title: "DPDK Performance Changes 2n-dnv 2t2c ndr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-ndr"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
+#  columns:
+#    - title: "2001"
+#      data-set: "dpdk-performance-changes-2n-dnv-h1"
+#    - title: "2005"
+#      data-set: "dpdk-performance-changes-2n-dnv-ref"
+#    - title: "2009"
+#      data-set: "dpdk-performance-changes-2n-dnv-cmp"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 2
+#      compare: 3
+#  legend:
+#    - ""
+#    - "2001, 2005, 2009 - DPDK versions tested."
+#    - "Diff - difference between 2005 and 2009 DPDK version."
+#
+## DPDK Performance Changes 3n-dnv 1t1c pdr
+#- type: "table"
+#  title: "DPDK Performance Changes 3n-dnv 1t1c pdr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-1t1c-pdr"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
+#  columns:
+#    - title: "2001"
+#      data-set: "dpdk-performance-changes-3n-dnv-h1"
+#    - title: "2005"
+#      data-set: "dpdk-performance-changes-3n-dnv-ref"
+#    - title: "2009"
+#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 2
+#      compare: 3
+#  legend:
+#    - ""
+#    - "2001, 2005, 2009 - DPDK versions tested."
+#    - "Diff - difference between 2005 and 2009 DPDK version."
+#
+## DPDK Performance Changes 3n-dnv 2t2c pdr
+#- type: "table"
+#  title: "DPDK Performance Changes 3n-dnv 2t2c pdr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-2t2c-pdr"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
+#  columns:
+#    - title: "2001"
+#      data-set: "dpdk-performance-changes-3n-dnv-h1"
+#    - title: "2005"
+#      data-set: "dpdk-performance-changes-3n-dnv-ref"
+#    - title: "2009"
+#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 2
+#      compare: 3
+#  legend:
+#    - ""
+#    - "2001, 2005, 2009 - DPDK versions tested."
+#    - "Diff - difference between 2005 and 2009 DPDK version."
+#
+## DPDK Performance Changes 3n-dnv 1t1c ndr
+#- type: "table"
+#  title: "DPDK Performance Changes 3n-dnv 1t1c ndr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-1t1c-ndr"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
+#  columns:
+#    - title: "2001"
+#      data-set: "dpdk-performance-changes-3n-dnv-h1"
+#    - title: "2005"
+#      data-set: "dpdk-performance-changes-3n-dnv-ref"
+#    - title: "2009"
+#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 2
+#      compare: 3
+#  legend:
+#    - ""
+#    - "2001, 2005, 2009 - DPDK versions tested."
+#    - "Diff - difference between 2005 and 2009 DPDK version."
+#
+## DPDK Performance Changes 3n-dnv 2t2c ndr
+#- type: "table"
+#  title: "DPDK Performance Changes 3n-dnv 2t2c ndr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-2t2c-ndr"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
+#  columns:
+#    - title: "2001"
+#      data-set: "dpdk-performance-changes-3n-dnv-h1"
+#    - title: "2005"
+#      data-set: "dpdk-performance-changes-3n-dnv-ref"
+#    - title: "2009"
+#      data-set: "dpdk-performance-changes-3n-dnv-cmp"
+#  comparisons:
+#    - title: "Diff"
+#      reference: 2
+#      compare: 3
+#  legend:
+#    - ""
+#    - "2001, 2005, 2009 - DPDK versions tested."
+#    - "Diff - difference between 2005 and 2009 DPDK version."
 
-# DPDK Performance Changes 2n-dnv 1t1c pdr
+# DPDK Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
-  title: "DPDK Performance Changes 2n-dnv 1t1c pdr"
+  title: "DPDK Performance Changes 3n-tsh 1t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-1t1c-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
+  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-dnv-cmp"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
+      data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
-# DPDK Performance Changes 2n-dnv 2t2c pdr
+# DPDK Performance Changes 3n-tsh 2t2c pdr
 - type: "table"
-  title: "DPDK Performance Changes 2n-dnv 2t2c pdr"
+  title: "DPDK Performance Changes 3n-tsh 2t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
+  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
-      data-set: "dpdk-performance-changes-2n-dnv-cmp"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
+      data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
-
-# DPDK Performance Changes 2n-dnv 1t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-dnv 1t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-1t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-  columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
-
-# DPDK Performance Changes 2n-dnv 2t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 2n-dnv 2t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-  columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-2n-dnv-ref"
-    - title: "2005"
-      data-set: "dpdk-performance-changes-2n-dnv-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
-
-# DPDK Performance Changes 3n-dnv 1t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-dnv 1t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-1t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-  columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
-
-# DPDK Performance Changes 3n-dnv 2t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-dnv 2t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-2t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-  columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
-
-# DPDK Performance Changes 3n-dnv 1t1c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-dnv 1t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-1t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-X553'"
-  columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
-
-# DPDK Performance Changes 3n-dnv 2t2c ndr
-- type: "table"
-  title: "DPDK Performance Changes 3n-dnv 2t2c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-dnv-2t2c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
-  columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-dnv-ref"
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-dnv-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
-
-# DPDK Performance Changes 3n-tsh 1t1c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-tsh 1t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
-
-# DPDK Performance Changes 3n-tsh 2t2c pdr
-- type: "table"
-  title: "DPDK Performance Changes 3n-tsh 2t2c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
-  columns:
-    - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
-    - title: "2005"
-      data-set: "dpdk-performance-changes-3n-tsh-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 1t1c ndr
 - type: "table"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Performance Changes 3n-tsh 2t2c ndr
 - type: "table"
   filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
   columns:
     - title: "2001"
-      data-set: "dpdk-performance-changes-3n-tsh-ref"
+      data-set: "dpdk-performance-changes-3n-tsh-h1"
     - title: "2005"
+      data-set: "dpdk-performance-changes-3n-tsh-ref"
+    - title: "2009"
       data-set: "dpdk-performance-changes-3n-tsh-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
-    - "Legend to Table"
-    - "2001, 2005 - DPDK versions tested."
-    - "Diff - difference between 2001 and 2005 DPDK version."
+    - ""
+    - "2001, 2005, 2009 - DPDK versions tested."
+    - "Diff - difference between 2005 and 2009 DPDK version."
 
 # DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
 - type: "table"
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw x710, 3n-skx x710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw x710 and 3n-skx x710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-hsw x710, 3n-skx x710 - testbeds and NICs tested."
     - "Diff - difference between 3n-hsw x710 and 3n-skx x710 testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "2n-skx, 2n-clx - testbeds and NICs tested."
     - "Diff - difference between 2n-skx and 2n-clx testbeds."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
       reference: 1
       compare: 2
   legend:
-    - "Legend to Table"
+    - ""
     - "3n-skx, 2n-skx - topologies tested."
     - "Diff - difference between 3n-skx and 2n-skx topologies."
 
   - "parent"
   - "msg"
 
-# Detailed Test Results - DPDK Performance Results 2n-dnv
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
-  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-dnv"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-# Detailed Test Results - DPDK Performance Results 3n-dnv
-- type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-dnv"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
-  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-3n-dnv"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+## Detailed Test Results - DPDK Performance Results 2n-dnv
+#- type: "table"
+#  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
+#  algorithm: "table_merged_details"
+#  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
+#  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-dnv"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
+#
+## Detailed Test Results - DPDK Performance Results 3n-dnv
+#- type: "table"
+#  title: "Detailed Test Results - DPDK Performance Results 3n-dnv"
+#  algorithm: "table_merged_details"
+#  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
+#  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-3n-dnv"
+#  filter: "all"
+#  parameters:
+#  - "name"
+#  - "parent"
+#  - "msg"
 
 # Detailed Test Results - DPDK Performance Results 3n-tsh
 - type: "table"
   filter: "all"
   data-start-level: 4
 
-# DPDK Performance Results 2n-dnv
-- type: "file"
-  title: "DPDK Performance Results 2n-dnv"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
-  data: "dpdk-perf-results-2n-dnv"
-  filter: "all"
-  data-start-level: 4
-
-# DPDK Performance Results 3n-dnv
-- type: "file"
-  title: "DPDK Performance Results 3n-dnv"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
-  data: "dpdk-perf-results-3n-dnv"
-  filter: "all"
-  data-start-level: 4
+## DPDK Performance Results 2n-dnv
+#- type: "file"
+#  title: "DPDK Performance Results 2n-dnv"
+#  algorithm: "file_test_results"
+#  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
+#  dir-tables: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
+#  data: "dpdk-perf-results-2n-dnv"
+#  filter: "all"
+#  data-start-level: 4
+#
+## DPDK Performance Results 3n-dnv
+#- type: "file"
+#  title: "DPDK Performance Results 3n-dnv"
+#  algorithm: "file_test_results"
+#  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
+#  dir-tables: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
+#  data: "dpdk-perf-results-3n-dnv"
+#  filter: "all"
+#  data-start-level: 4
 
 # DPDK Performance Results 3n-tsh
 - type: "file"
     title: "3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho"
     layout: "plot-hoststack"
 
-## Plots VPP HTTP Server Performance
-#- type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_perf_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  filter: "'HTTP' and 'TCP_CPS' and not '8T4C'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "y+name"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-cps"
-#
-#- type: "plot"
-#  title: "VPP HTTP Server Performance"
-#  algorithm: "plot_http_server_perf_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
-#  data:
-#    "plot-vpp-http-server-performance"
-#  filter: "'HTTP' and 'TCP_RPS' and not '8T4C'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  traces:
-#    hoverinfo: "y+name"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "VPP HTTP Server Performance"
-#    layout:
-#      "plot-rps"
-
 ################################################################################
 
 # Soak Test (PLRsearch), boxes - 2n-clx
 #    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
 #    layout: "plot-service-density"
 
-# Plots - NF Density - CSC IPSEC 4tnl - NDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSC IPSEC 4tnl - PDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
-    layout: "plot-service-density"
+## Plots - NF Density - CSC IPSEC 4tnl - NDR IMIX
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '2T1C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '4T2C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '8T4C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+## Plots - NF Density - CSC IPSEC 4tnl - PDR IMIX
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '2T1C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '4T2C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '8T4C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+#    layout: "plot-service-density"
 
 ###############################################################################
 
 #    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
 #    layout: "plot-service-density"
 
-# Plots - NF Density - CSC IPSEC 1000tnl - NDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_1000' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_1000' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_1000' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSC IPSEC 1000tnl - PDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_1000' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_1000' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_1000' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
-    layout: "plot-service-density"
+## Plots - NF Density - CSC IPSEC 1000tnl - NDR IMIX
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '2T1C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '4T2C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '8T4C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+## Plots - NF Density - CSC IPSEC 1000tnl - PDR IMIX
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '2T1C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '4T2C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '8T4C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-pdr"
+#    layout: "plot-service-density"
 
 ###############################################################################
 
 #    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #    layout: "plot-service-density"
 
-# Plots - NF Density - CSC IPSEC 10000tnl - NDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_10000' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_10000' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_10000' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
-    layout: "plot-service-density"
-
-# Plots - NF Density - CSC IPSEC 10000tnl - PDR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_10000' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_10000' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-skx-ndrpdr"
-  filter: "'NIC_Intel-XXV710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_10000' and
-           'IMIX' and
-           '8T4C' and
-           'NDRPDR'"
-  parameters:
-  - "throughput"
-  - "name"
-  - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
-    layout: "plot-service-density"
+## Plots - NF Density - CSC IPSEC 10000tnl - NDR IMIX
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
+#           'IMIX' and
+#           '2T1C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
+#           'IMIX' and
+#           '4T2C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
+#           'IMIX' and
+#           '8T4C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
+#    layout: "plot-service-density"
+#
+## Plots - NF Density - CSC IPSEC 10000tnl - PDR IMIX
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
+#           'IMIX' and
+#           '2T1C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
+#           'IMIX' and
+#           '4T2C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-skx-ndrpdr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
+#           'IMIX' and
+#           '8T4C' and
+#           'NDRPDR'"
+#  parameters:
+#  - "throughput"
+#  - "name"
+#  - "tags"
+#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
+#    layout: "plot-service-density"
 
 ###############################################################################
 
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+    layout: "plot-throughput"
+
+#- type: "plot"
+#  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+    layout: "plot-throughput"
+
+#- type: "plot"
+#  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    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-features-ip4routing-base-dpdk-ndr"
   algorithm: "plot_perf_box_name"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-1t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-1t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-1t1c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-1t1c-features-ip4routing-base-ixgbe-pdr"
     layout: "plot-throughput"
     title: "3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-pdr"
     layout: "plot-throughput"
 
-#- type: "plot"
-#  title: "Throughput: 2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-#  layout:
-#    title: "2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "Throughput: 2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-#  layout:
-#    title: "2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
-#    layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
+    layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 2n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe-ndr"
     title: "2n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe-pdr"
     layout: "plot-throughput"
 
-#- type: "plot"
-#  title: "Throughput: 3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "Throughput: 3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
-#    layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-1t1c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-1t1c-l2switching-base-ixgbe-pdr"
+    layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe-ndr"
     title: "3n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe-pdr"
     layout: "plot-throughput"
 
-#- type: "plot"
-#  title: "Throughput: 3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-ndr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-ndr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-ndr"
-#    layout: "plot-throughput"
-#
-#- type: "plot"
-#  title: "Throughput: 3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-pdr"
-#  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-pdr"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-pdr"
-#    layout: "plot-throughput"
+- type: "plot"
+  title: "Throughput: 3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-ndr"
+  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-pdr"
+  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-1t1c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-1t1c-features-l2switching-base-ixgbe-pdr"
+    layout: "plot-throughput"
 
 - type: "plot"
   title: "Throughput: 3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-features-ip4routing-base-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+  layout:
+    title: "2n-skx-xxv710-64b-features-ip4routing-base-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-ndr"
+    title: "2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale20K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale20k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale200k-rnd-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-.t.c-ethip4-ip4scale2m-rnd-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-64b-ip4routing-scale-dpdk-rnd-pdr"
+    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
 
+#- type: "plot"
+#  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "22n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-avf-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-64b-features-ip4routing-base-avf-ndr"
+    title: "2n-skx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa"
+  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-features-ip4routing-base-avf-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-skx"
   include:
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
   layout:
-    title: "2n-skx-xxv710-64b-features-ip4routing-base-avf-pdr"
+    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+#- type: "plot"
+#  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-skx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-skx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "22n-skx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-tsh-x520-64b-features-ip4routing-base-ixgbe-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "3n-tsh-x520-64b-features-ip4routing-base-ixgbe-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr-tsa"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
     title: "2n-dnv-x553-78b-ip6routing-base-scale-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
 
-#- type: "plot"
-#  title: "Speedup: 2n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
-#  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-#  layout:
-#    title: "2n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: 2n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
-#  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-#  layout:
-#    title: "2n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
-#    layout: "plot-throughput-speedup-analysis"
+- type: "plot"
+  title: "Speedup: 2n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 2n-dnv-x553-64b-l2switching-base-scale-ixgbe-ndr-tsa"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-features-ip4routing-base-ixgbe-ndr-tsa"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X553-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
   layout:
     title: "3n-dnv-x553-64b-features-ip4routing-base-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
     title: "3n-dnv-x553-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
 
-#- type: "plot"
-#  title: "Speedup: 3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
-#  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: 3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
-#  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
-#    layout: "plot-throughput-speedup-analysis"
+- type: "plot"
+  title: "Speedup: 3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-l2switching-base-ixgbe-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Xcbase-Ndrpdr.64B-.t.c-dot1q-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-dot1q-l2bdbasemaclrn-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-l2switching-base-ixgbe-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
   title: "Speedup: 3n-dnv-x553-64b-l2switching-base-scale-ixgbe-ndr-tsa"
     title: "3n-dnv-x553-64b-l2switching-base-scale-ixgbe-pdr-tsa"
     layout: "plot-throughput-speedup-analysis"
 
-#- type: "plot"
-#  title: "Speedup: 3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa"
-#  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa"
-#    layout: "plot-throughput-speedup-analysis"
-#
-#- type: "plot"
-#  title: "Speedup: 3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa"
-#  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa"
-#  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
-#  include:
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
-#    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
-#  layout:
-#    title: "3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa"
-#    layout: "plot-throughput-speedup-analysis"
+- type: "plot"
+  title: "Speedup: 3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-features-l2switching-base-ixgbe-ndr-tsa"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-3n-dnv"
+  include:
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Xcbase-Ndrpdr.64B-.t.c-eth-l2xcbase-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr"
+    - "Tests.Vpp.Perf.L2.10Ge2P1X553-Eth-L2Bdbasemaclrn-Macip-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr"
+  layout:
+    title: "3n-dnv-x553-64b-features-l2switching-base-ixgbe-pdr-tsa"
+    layout: "plot-throughput-speedup-analysis"
 
 #- type: "plot"
 #  title: "Speedup: 3n-dnv-x553-78b-srv6-ip6routing-base-ixgbe-ndr-tsa"
   data: "plot-dpdk-throughput-latency-3n-hsw"
   include:
     - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-xl710-64b-2t2c-base-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  include:
-    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-xl710-64b-1t1c-base-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  include:
-    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-xl710-64b-2t2c-base-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  include:
-    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-xl710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# 3n-hsw-x710
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-x710-64b-1t1c-base-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  include:
-    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-x710-64b-1t1c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-x710-64b-2t2c-base-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  include:
-    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-x710-64b-2t2c-base-ndr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-x710-64b-1t1c-base-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  include:
-    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-x710-64b-1t1c-base-pdr"
-    layout: "plot-throughput"
-
-- type: "plot"
-  title: "DPDK Throughput: 3n-hsw-x710-64b-2t2c-base-pdr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-hsw"
-  include:
-    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
-  layout:
-    title: "3n-hsw-x710-64b-2t2c-base-pdr"
-    layout: "plot-throughput"
-
-# 2n-dnv-x553
-
-- type: "plot"
-  title: "DPDK Throughput: 2n-dnv-x553-64b-1t1c-base-ndr"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-dnv"
-  include:
-    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "2n-dnv-x553-64b-1t1c-base-ndr"
+    title: "3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: 2n-dnv-x553-64b-2t2c-base-ndr"
+  title: "DPDK Throughput: 3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-2n-dnv"
+  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   include:
-    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "2n-dnv-x553-64b-2t2c-base-ndr"
+    title: "3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: 2n-dnv-x553-64b-1t1c-base-pdr"
+  title: "DPDK Throughput: 3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-dnv"
+  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   include:
-    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "2n-dnv-x553-64b-1t1c-base-pdr"
+    title: "3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: 2n-dnv-x553-64b-2t2c-base-pdr"
+  title: "DPDK Throughput: 3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-2n-dnv"
+  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   include:
-    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.40ge2p1xl710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "2n-dnv-x553-64b-2t2c-base-pdr"
+    title: "3n-hsw-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
-# 3n-dnv-x553
+# 3n-hsw-x710
 
 - type: "plot"
-  title: "DPDK Throughput: 3n-dnv-x553-64b-1t1c-base-ndr"
+  title: "DPDK Throughput: 3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-1t1c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-dnv"
+  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-1t1c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   include:
-    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "3n-dnv-x553-64b-1t1c-base-ndr"
+    title: "3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: 3n-dnv-x553-64b-2t2c-base-ndr"
+  title: "DPDK Throughput: 3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-2t2c-base-ndr"
-  data: "plot-dpdk-throughput-latency-3n-dnv"
+  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-2t2c-base-ndr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   include:
-    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "3n-dnv-x553-64b-2t2c-base-ndr"
+    title: "3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: 3n-dnv-x553-64b-1t1c-base-pdr"
+  title: "DPDK Throughput: 3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-1t1c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-dnv"
+  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-1t1c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   include:
-    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "3n-dnv-x553-64b-1t1c-base-pdr"
+    title: "3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "DPDK Throughput: 3n-dnv-x553-64b-2t2c-base-pdr"
+  title: "DPDK Throughput: 3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-2t2c-base-pdr"
-  data: "plot-dpdk-throughput-latency-3n-dnv"
+  output-file: "{DIR[STATIC,DPDK]}/3n-hsw-x710-64b-2t2c-base-pdr"
+  data: "plot-dpdk-throughput-latency-3n-hsw"
   include:
-    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
-    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+    - "tests.dpdk.perf.10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
   layout:
-    title: "3n-dnv-x553-64b-2t2c-base-pdr"
+    title: "3n-hsw-x710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
+## 2n-dnv-x553
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-dnv-x553-64b-1t1c-base-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-1t1c-base-ndr"
+#  data: "plot-dpdk-throughput-latency-2n-dnv"
+#  include:
+#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-dnv-x553-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-dnv-x553-64b-2t2c-base-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-2t2c-base-ndr"
+#  data: "plot-dpdk-throughput-latency-2n-dnv"
+#  include:
+#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-dnv-x553-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-dnv-x553-64b-1t1c-base-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-1t1c-base-pdr"
+#  data: "plot-dpdk-throughput-latency-2n-dnv"
+#  include:
+#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-dnv-x553-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 2n-dnv-x553-64b-2t2c-base-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/2n-dnv-x553-64b-2t2c-base-pdr"
+#  data: "plot-dpdk-throughput-latency-2n-dnv"
+#  include:
+#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.2N1L-10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "2n-dnv-x553-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+#
+## 3n-dnv-x553
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 3n-dnv-x553-64b-1t1c-base-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-1t1c-base-ndr"
+#  data: "plot-dpdk-throughput-latency-3n-dnv"
+#  include:
+#    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "3n-dnv-x553-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 3n-dnv-x553-64b-2t2c-base-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-2t2c-base-ndr"
+#  data: "plot-dpdk-throughput-latency-3n-dnv"
+#  include:
+#    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "3n-dnv-x553-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 3n-dnv-x553-64b-1t1c-base-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-1t1c-base-pdr"
+#  data: "plot-dpdk-throughput-latency-3n-dnv"
+#  include:
+#    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-1t1c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-1t1c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "3n-dnv-x553-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "DPDK Throughput: 3n-dnv-x553-64b-2t2c-base-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,DPDK]}/3n-dnv-x553-64b-2t2c-base-pdr"
+#  data: "plot-dpdk-throughput-latency-3n-dnv"
+#  include:
+#    - "tests.dpdk.perf.10Ge2P1X553-eth-l2xcbase-testpmd-ndrpdr.64b-2t2c-eth-l2xcbase-testpmd-ndrpdr"
+#    - "tests.dpdk.perf.10Ge2P1X553-ethip4-ip4base-l3fwd-ndrpdr.64b-2t2c-ethip4-ip4base-l3fwd-ndrpdr"
+#  layout:
+#    title: "3n-dnv-x553-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+
 # 3n-tsh-x520
 
 - type: "plot"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-ndr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-#    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr-pdr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
-#    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.2N1L-100Ge2P1Cx556A-Rdma-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-rdma-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput"
 
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-ndr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
+    layout: "plot-throughput"
+
+#- type: "plot"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-2t1c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-bidir-avf-pdr"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+  algorithm: "plot_perf_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
+    layout: "plot-throughput"
+
+#- type: "plot"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#    layout: "plot-throughput"
+#
+#- type: "plot"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+#  algorithm: "plot_perf_box_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    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-features-ip4routing-base-dpdk-ndr"
   algorithm: "plot_perf_box_name"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
-#    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-2t1c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-features-ip4routing-base-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-avf-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-features-ip4routing-base-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+#- type: "plot"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "22n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
+#    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.64b-.t.c-avf-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-nat44det-ip4routing-stl-bidir-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa"
+  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+  include:
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
+    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
+  layout:
+    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
+#- type: "plot"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+#
+#- type: "plot"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa"
+#  algorithm: "plot_tsa_name"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa"
+#  data: "plot-vpp-throughput-lat-tsa-2n-clx"
+#  include:
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h4096-p63-s258048-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h16384-p63-s1032192-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
+#    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
+#  layout:
+#    title: "22n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
+#    layout: "plot-throughput-speedup-analysis"
+
 - type: "plot"
   title: "Speedup: 2n-clx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa"
   algorithm: "plot_tsa_name"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-features-ip4routing-base-dpdk-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-ethip4udp-ip4base-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
   layout:
     title: "2n-clx-xxv710-64b-features-ip4routing-base-dpdk-pdr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-rdma-ethip4-features-ndr"
     layout: "plot-throughput-speedup-analysis"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Iacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sf-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Oacl50Sl-10Kflows-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Base-Nat44-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4base-nat44-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-.t.c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1-p1-s1-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1-p1-s1-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-ethip4udp-nat44det-h1024-p63-s64512-Ndrpdr.64B-.t.c-rdma-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-rdma-ethip4-features-pdr"
     layout: "plot-throughput-speedup-analysis"
   layout:
     layout: "plot-hdrh-latency-by-percentile"
 
+- type: "plot"
+  title: "Latency by percentile: 2n-skx-nat44"
+  algorithm: "plot_hdrh_lat_by_percentile"
+  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"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-by-percentile"
+
 - type: "plot"
   title: "Latency by percentile: 3n-skx"
   algorithm: "plot_hdrh_lat_by_percentile"