Report 2005: Add data
[csit.git] / resources / tools / presentation / specification.yaml
index ab54aa1..66f2035 100644 (file)
 
   data-sets:
 
-    ###########################################################################
-    # Replacements:
-
-    replacement-1908-vpp-throughput-lat-tsa-3n-hsw-vhost:
-      csit-vpp-perf-verify-1908-3n-hsw:
-        - 48  # NDRPDR sel vhost
-        - 49  # NDRPDR sel vhost
-        - 52  # NDRPDR sel vhost
-        - 53  # NDRPDR sel vhost
-        - 54  # NDRPDR sel vhost
-        - 55  # NDRPDR sel vhost
-        - 56  # NDRPDR sel vhost
-        - 57  # NDRPDR sel vhost
-        - 58  # NDRPDR sel vhost
-        - 59  # NDRPDR sel vhost
-
-    replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 52  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 53  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 55  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 61  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 62  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 63  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 64  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 65  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 66  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 67  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-
-    replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 88  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 89  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 91  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 92  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 93  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 94  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 95  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 96  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 97  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-        - 98  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-
     ###########################################################################
     # Plots:
 
     # 3n-hsw
 
     plot-vpp-throughput-lat-tsa-3n-hsw:
-      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
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        -   # NDRPDR sel
+        -   # NDRPDR sel
+        -   # 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-hdrh-lat-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 22  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        -   # NDRPDR sel
 
-    plot-vpp-nfv-3n-hsw-ndrpdr:
-      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
+#    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-verify-2001-3n-hsw:
-        - 17  # MRR sel
+#    plot-vpp-nfv-3n-hsw-mrr:
+#      csit-vpp-perf-report-iterative-2005-3n-hsw:
+#        - 13  # MRR
+
+    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
 
     plot-dpdk-throughput-latency-3n-hsw:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-        - 4   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-
-    plot-vpp-hoststack-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 103  # hoststack
-        - 104  # hoststack
-        - 105  # hoststack
-        - 106  # hoststack
-        - 107  # hoststack
-        - 108  # hoststack
-        - 109  # hoststack
-        - 110  # hoststack
-        - 111  # hoststack
-        - 112  # hoststack
+        - 14  # NDRPDR sel
 
     plot-dpdk-hdrh-lat-3n-hsw:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-        - 16  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-hsw:
+        -   # NDRPDR sel
 
     # 3n-skx
 
     plot-vpp-throughput-lat-tsa-3n-skx:
-      # TODO: Add the data
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 71  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 72  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 76  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 77  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 78  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 80  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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
 
     plot-vpp-hdrh-lat-3n-skx:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        - 36  # NDRPDR sel
 
     plot-vpp-nfv-3n-skx-ndrpdr:
-      # TODO: Add data
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      # 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-mrr:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 50  # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        -   # MRR sel
 
     plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-verify-2001-3n-skx:
-        - 29  # NDRPDR sel xxv710
-        - 33  # NDRPDR sel xxv710
-        - 34  # NDRPDR sel xxv710
-        - 35  # NDRPDR sel xxv710
-        - 36  # NDRPDR sel xxv710
-        - 37  # NDRPDR sel xxv710
-        - 41  # NDRPDR sel xxv710
-        - 42  # NDRPDR sel xxv710
-        - 43  # NDRPDR sel xxv710
-        - 45  # NDRPDR sel xxv710
-        - 30  # NDRPDR sel x710
-        - 31  # NDRPDR sel x710
-        - 32  # NDRPDR sel x710
-        - 38  # NDRPDR sel x710
-        - 39  # NDRPDR sel x710
-        - 40  # NDRPDR sel x710
-        - 44  # NDRPDR sel x710
-        - 46  # NDRPDR sel x710
-        - 47  # NDRPDR sel x710
-        - 48  # NDRPDR sel x710
+      csit-dpdk-perf-report-iterative-2005-3n-skx:
+        - 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
 
     plot-dpdk-hdrh-lat-3n-skx:
-      csit-dpdk-perf-verify-2001-3n-skx:
-        - 29  # NDRPDR sel xxv710
+      csit-dpdk-perf-report-iterative-2005-3n-skx:
+        - 4   # NDRPDR sel
 
     # 2n-skx
 
     plot-vpp-throughput-lat-tsa-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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
 
     plot-vpp-hdrh-lat-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-
-    plot-vpp-http-server-performance:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 80  # TCP
-        - 82  # TCP
-        - 83  # TCP
-        - 85  # TCP
-        - 86  # TCP
-        - 87  # TCP
-        - 88  # TCP
-        - 89  # TCP
-        - 90  # TCP
-        - 91  # TCP
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 55  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 181  # Soak
-        - 182  # Soak
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 49  # Soak
+        - 54  # Soak
 
     plot-vpp-nfv-2n-skx-ndrpdr:
-      # TODO: Replace the data
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 30  # NFV
-        - 31  # NFV
+      # TODO: Add data:
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 43  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 78  # nf-density-sel
+        - 83  # nf-density-sel
 
     plot-vpp-nfv-2n-skx-mrr:
-      # TODO: Replace the data
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 71  # NFV MRR
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 42  # MRR sel
 
     plot-vpp-nfv-reconf-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 169  # Reconf
-        - 171  # Reconf
-        - 172  # Reconf
-        - 173  # Reconf
-        - 174  # Reconf
-        - 175  # Reconf
-        - 176  # Reconf
-        - 177  # Reconf
-        - 178  # Reconf
-        - 179  # Reconf
+      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
 
     plot-dpdk-throughput-latency-2n-skx:
-      csit-dpdk-perf-verify-2001-2n-skx:
-        - 35  # NDRPDR sel xxv710
-        - 36  # NDRPDR sel xxv710
-        - 37  # NDRPDR sel xxv710
-        - 41  # NDRPDR sel xxv710
-        - 42  # NDRPDR sel xxv710
-        - 43  # NDRPDR sel xxv710
-        - 46  # NDRPDR sel xxv710
-        - 47  # NDRPDR sel xxv710
-        - 52  # NDRPDR sel xxv710
-        - 53  # NDRPDR sel xxv710
-        - 38  # NDRPDR sel x710
-        - 39  # NDRPDR sel x710
-        - 40  # NDRPDR sel x710
-        - 44  # NDRPDR sel x710
-        - 45  # NDRPDR sel x710
-        - 48  # NDRPDR sel x710
-        - 49  # NDRPDR sel x710
-        - 50  # NDRPDR sel x710
-        - 51  # NDRPDR sel x710
-        - 54  # NDRPDR sel x710
+      csit-dpdk-perf-report-iterative-2005-2n-skx:
+        - 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
 
     plot-dpdk-hdrh-lat-2n-skx:
-      csit-dpdk-perf-verify-2001-2n-skx:
-        - 35  # NDRPDR sel xxv710
+      csit-dpdk-perf-report-iterative-2005-2n-skx:
+        - 1   # NDRPDR sel
 
     # 2n-clx
 
     plot-vpp-throughput-lat-tsa-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
+      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
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # NDRPDR sel
+        - 50  # NDRPDR sel
+        - 51  # NDRPDR sel
 
     plot-vpp-hdrh-lat-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
+      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
 
     plot-vpp-nfv-2n-clx-ndrpdr:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 7   # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 39  # NDRPDR sel
         - 40  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # 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
 
     plot-vpp-nfv-2n-clx-mrr:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 39  # MRR
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 12   # MRR
 
     plot-vpp-nfv-reconf-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 68  # Reconf
-        - 69  # Reconf
-        - 70  # Reconf
-        - 71  # Reconf
-        - 72  # Reconf
-        - 73  # Reconf
-        - 74  # Reconf
-        - 75  # Reconf
-        - 76  # Reconf
-        - 77  # Reconf
+      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
 
     plot-vpp-soak-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 93  # Soak
-        - 94  # Soak
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 44  # Soak
+        - 49  # Soak
 
     plot-dpdk-throughput-latency-2n-clx:
-      csit-dpdk-perf-verify-2001-2n-clx:
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 33  # NDRPDR sel
-        - 34  # NDRPDR sel
-
+      csit-dpdk-perf-report-iterative-2005-2n-clx:
+        - 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
 
     plot-dpdk-hdrh-lat-2n-clx:
-      csit-dpdk-perf-verify-2001-2n-clx:
-        - 15  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-2n-clx:
+        - 1   # NDRPDR sel
 
     # 3n-tsh
 
     plot-vpp-throughput-lat-tsa-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 10  # NDRPDR sel
+      # TODO: Add data:
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 9   # NDRPDR sel
+        - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 13  # NDRPDR sel
+        - 20  # NDRPDR sel
         - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
         - 21  # NDRPDR sel
 
     plot-vpp-hdrh-lat-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 10  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        -   # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-tsh:
-      csit-dpdk-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-tsh:
         - 5   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 18  # NDRPDR sel
 
     plot-dpdk-hdrh-lat-3n-tsh:
-      csit-dpdk-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-tsh:
+        - 5   # NDRPDR sel
 
     # 3n-dnv
 
     plot-vpp-throughput-lat-tsa-3n-dnv:
-      csit-vpp-perf-verify-2001-3n-dnv:
+      csit-vpp-perf-report-iterative-2005-3n-dnv:
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-dnv:
-      csit-dpdk-perf-verify-2001-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
-        - 15  # NDRPDR sel
         - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 22  # NDRPDR sel
 
     # 2n-dnv
 
     plot-vpp-throughput-lat-tsa-2n-dnv:
-      csit-vpp-perf-verify-2001-2n-dnv:
-        - 4   # NDRPDR sel
-        - 5   # NDRPDR 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
-        - 16  # NDRPDR sel
+        - 14  # NDRPDR sel
 
     plot-dpdk-throughput-latency-2n-dnv:
-      csit-dpdk-perf-verify-2001-2n-dnv:
+      csit-dpdk-perf-report-iterative-2005-2n-dnv:
+        - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 15  # NDRPDR sel
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
 
     ###########################################################################
     # Simple tables (only one data set):
     # NIC Comparisons
 
     vpp-nic-comparison-3n-skx:
-      # TODO: Add the data
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 71  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 72  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 76  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 77  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 78  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 80  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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-nic-comparison-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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-nic-comparison-3n-skx-mrr:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 50  # MRR sel
-        - 53  # MRR sel addition
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        - 6   # MRR sel
 
     vpp-nic-comparison-2n-skx-mrr:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 101 # MRR sel
-        - 128 # MRR sel addition
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 42  # MRR sel
 
     # Results
 
     vpp-perf-results-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 18  # NDRPDR full
-        - 20  # NDRPDR full
-        - 28  # NDRPDR full
-        - 35  # NDRPDR full
-        - 42  # NDRPDR full
-        - 46  # NDRPDR full
-        - 47  # NDRPDR full
-        - 48  # NDRPDR full
-        - 49  # NDRPDR full
-        - 50  # NDRPDR full
-        - 51  # NDRPDR full
-        - 52  # NDRPDR full
-        - 53  # NDRPDR full
-        - 54  # NDRPDR full
-        - 55  # NDRPDR full
-        - 56  # NDRPDR full
-        - 57  # NDRPDR full
-        - 58  # NDRPDR full
-        - 59  # NDRPDR full
-        - 61  # NDRPDR full
-        - 62  # NDRPDR full
-        - 63  # NDRPDR full
-        - 64  # NDRPDR full
-        - 65  # NDRPDR full
-        - 67  # NDRPDR full
-        - 70  # NDRPDR full
-        - 72  # NDRPDR full
-        - 73  # NDRPDR full
-        - 76  # NDRPDR full
-        - 77  # NDRPDR full
-        - 78  # NDRPDR full
-        - 79  # NDRPDR full
-        - 81  # NDRPDR full
-        - 82  # NDRPDR full
-        - 84  # NDRPDR full
-        - 85  # NDRPDR full
+      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
 
     vpp-perf-results-3n-skx:
-      # TODO: Add data
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 82  # NDRPDR full - crypto-1
-        - 85  # NDRPDR full - l2-2
-        - 87  # NDRPDR full - ip6-1
-        - 88  # NDRPDR full - ip6-2
-        - 90  # NDRPDR full - memif
-        - 95  # NDRPDR full - l2-1
-        - 96  # NDRPDR full - ip4-2
-        - 97  # NDRPDR full - vhost-1
-        - 102 # NDRPDR full - crypto-2
-        - 104 # NDRPDR full - ip4tunnels-1
-        - 105 # NDRPDR full - ip4tunnels-2
-        - 106 # NDRPDR full - ip4tunnels-3
-        - 107 # NDRPDR full - ip6tunnels-1
-        - 108 # NDRPDR full - ip4-1
+      csit-vpp-perf-report-coverage-2005-3n-skx:
+        - 10  # perf-full-3n-skx-crypto_I
+        - 11  # perf-full-3n-skx-crypto_II
+        - 12  # perf-full-3n-skx-crypto_III
+        - 5   # perf-full-3n-skx-ip4_I
+        - 14  # perf-full-3n-skx-ip4_II
+        - 7   # perf-full-3n-skx-ip4_III
+        - 15  # perf-full-3n-skx-ip4_IV
+        - 16  # perf-full-3n-skx-ip4_V
+        - 17  # perf-full-3n-skx-ip4_VI
+        - 18  # perf-full-3n-skx-ip4_VII
+        - 19  # perf-full-3n-skx-ip4_VIII
+        - 20  # perf-full-3n-skx-ip4_IX
+        - 24  # perf-full-3n-skx-ip6_I
+        - 25  # perf-full-3n-skx-ip6_II
+        - 21  # perf-full-3n-skx-ip4tunnels-I
+        - 22  # perf-full-3n-skx-ip4tunnels-II
+        - 23  # perf-full-3n-skx-ip4tunnels-III
+        - 26  # perf-full-3n-skx-ip6tunnels-I
+        - 28  # perf-full-3n-skx-l2_II
+        - 29  # perf-full-3n-skx-l2_III
+        - 30  # perf-full-3n-skx-l2_IV
+        - 32  # perf-full-3n-skx-l2_VI
+        - 33  # perf-full-3n-skx-l2_VII
+        - 34  # perf-full-3n-skx-l2_VIII
+        - 35  # perf-full-3n-skx-l2_IX
+        - 36  # perf-full-3n-skx-l2_X
+        - 37  # perf-full-3n-skx-l2_XI
+        - 38  # perf-full-3n-skx-memif
+        - 39  # perf-full-3n-skx-srv6-I
+        - 40  # perf-full-3n-skx-srv6-II
+        - 43  # perf-full-3n-skx-vhost-III
 
     vpp-perf-results-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 155  # NDRPDR full - perf-full-2n-skx-ip4_I - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 156  # NDRPDR full - perf-full-2n-skx-ip4_II - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 157  # NDRPDR full - perf-full-2n-skx-ip4_III - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 158  # NDRPDR full - perf-full-2n-skx-ip4_V - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 159  # NDRPDR full - perf-full-2n-skx-ip4_VIII - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 160  # NDRPDR full - perf-full-2n-skx-ip4_IX - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 161  # NDRPDR full - perf-full-2n-skx-ip6_I - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 162  # NDRPDR full - perf-full-2n-skx-ip6_II - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 163  # NDRPDR full - perf-full-2n-skx-l2_I - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 164  # NDRPDR full - perf-full-2n-skx-l2_II - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 165  # NDRPDR full - perf-full-2n-skx-memif - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 166  # NDRPDR full - perf-full-2n-skx-vhost I - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 167  # NDRPDR full - perf-full-2n-skx-vhost II - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 168  # NDRPDR full - perf-full-2n-skx-vts - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      # 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
 
     vpp-perf-results-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 53  # NDRPDR full
-        - 54  # NDRPDR full
-        - 55  # NDRPDR full
-        - 56  # NDRPDR full
-        - 57  # NDRPDR full
-        - 58  # NDRPDR full
-        - 59  # NDRPDR full
-        - 60  # NDRPDR full
-        - 61  # NDRPDR full
-        - 62  # NDRPDR full
-        - 63  # NDRPDR full
-        - 64  # NDRPDR full
-        - 65  # NDRPDR full
-        - 66  # NDRPDR full
-        - 67  # NDRPDR full
+      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
 
     vpp-perf-results-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 10  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        -   # NDRPDR sel
 
     vpp-perf-results-3n-dnv:
-      csit-vpp-perf-verify-2001-3n-dnv:
-        - 19  # NDRPDR full
-        - 20  # NDRPDR full
-        - 21  # NDRPDR full
-        - 22  # NDRPDR full
-        - 23  # NDRPDR full
-        - 24  # NDRPDR full
-        - 25  # NDRPDR full
-        - 26  # NDRPDR full
-        - 37  # NDRPDR full
-        - 38  # NDRPDR full
-        - 39  # NDRPDR full
+      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
 
     vpp-perf-results-2n-dnv:
-      csit-vpp-perf-verify-2001-2n-dnv:
-        - 21  # NDRPDR full
-        - 22  # NDRPDR full
-        - 25  # NDRPDR full
-        - 26  # NDRPDR full
-        - 27  # NDRPDR full
-        - 28  # NDRPDR full
+      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
 
     vpp-mrr-results-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 17  # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        - 13  # MRR
 
     vpp-mrr-results-3n-skx:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 50  # MRR sel
-        - 53  # MRR sel addition
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        - 6   # MRR sel
 
     vpp-mrr-results-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 101 # MRR sel
-        - 128 # MRR sel addition
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 42  # MRR sel
 
     vpp-mrr-results-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 39  # MRR
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 12   # MRR
 
     vpp-mrr-results-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        -   # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 10  # MRR sel
 
     vpp-mrr-results-3n-dnv:
-      csit-vpp-perf-verify-2001-3n-dnv:
-        - 11  # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-dnv:
+        - 8   # MRR
 
     vpp-mrr-results-2n-dnv:
-      csit-vpp-perf-verify-2001-2n-dnv:
-        - 12  # MRR sel
+      csit-vpp-perf-report-iterative-2005-2n-dnv:
+        - 15  # MRR sel
 
     vpp-device-results-ubuntu:
-      csit-vpp-device-2001-ubuntu1804-1n-skx:
-        - 57
+      csit-vpp-device-2005-ubuntu1804-1n-skx:
+        - 35
 
     dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-        - 25  # NDRPDR full
-        - 26  # NDRPDR full
+      csit-dpdk-perf-report-iterative-2005-3n-hsw:
+        - 5   # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
-      csit-dpdk-perf-verify-2001-3n-skx:
-        - 29  # NDRPDR sel xxv710
-        - 30  # NDRPDR sel x710
+      csit-dpdk-perf-report-iterative-2005-3n-skx:
+        - 4   # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
-      csit-dpdk-perf-verify-2001-2n-skx:
-        - 35  # NDRPDR sel xxv710
-        - 38  # NDRPDR sel x710
+      csit-dpdk-perf-report-iterative-2005-2n-skx:
+        - 1   # NDRPDR sel
 
     dpdk-perf-results-2n-clx:
-      csit-dpdk-perf-verify-2001-2n-clx:
-        - 15  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-2n-clx:
+        - 1   # NDRPDR sel
 
     dpdk-perf-results-2n-dnv:
-      csit-dpdk-perf-verify-2001-2n-dnv:
-        - 16  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-2n-dnv:
+        -   # NDRPDR sel
 
     dpdk-perf-results-3n-dnv:
-      csit-dpdk-perf-verify-2001-3n-dnv:
-        - 12  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-dnv:
+        -   # NDRPDR sel
 
     dpdk-perf-results-3n-tsh:
-      csit-dpdk-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-tsh:
+        - 5   # NDRPDR sel
 
 ###########################################################################
     # Tables (more than one data set)
 
     # Performance changes
 
-    vpp-perf-changes-2n-skx-old1908_0:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 26  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 27  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 34  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 35  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 36  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 42  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 43  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 44  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 45  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 46  # NDRPDR sel - old1908 - vpp build: 19.08-release
-    vpp-perf-changes-2n-skx-old1908_1:
-      csit-vpp-perf-verify-1908_1-2n-skx:
-        - 3   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 4   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 6   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 10  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 14  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 16  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 21  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 23  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 24  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 25  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-    vpp-perf-changes-2n-skx-new1908_1:
-      csit-vpp-perf-verify-1908_1-2n-skx:
-        - 39  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 40  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 41  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 43  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 44  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 45  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 46  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 47  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 48  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 49  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-    vpp-perf-changes-2n-skx-new1908_2:
-      csit-vpp-perf-verify-1908_2-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
-    vpp-perf-changes-2n-skx-new2001_0:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-
-    vpp-perf-changes-3n-skx-old1908_0:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 14  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 16  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 19  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 20  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 22  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 23  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 24  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 25  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 26  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 29  # NDRPDR sel - old1908 - vpp build: 19.08-release
-    vpp-perf-changes-3n-skx-old1908_1:
-      csit-vpp-perf-verify-1908_1-3n-skx:
-        - 3   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 4   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 7   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 8   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 9   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 10  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 11  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 12  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 13  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-        - 14  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-    vpp-perf-changes-3n-skx-new1908_1:
-      csit-vpp-perf-verify-1908_1-3n-skx:
-        - 26  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 27  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 28  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 29  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 30  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 31  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 33  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 34  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 35  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-        - 36  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-    vpp-perf-changes-3n-skx-new1908_2:
-      csit-vpp-perf-verify-1908_2-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-    vpp-perf-changes-3n-skx-new2001_0:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 71  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 72  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 76  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 77  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 78  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 80  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-
-    vpp-perf-changes-2n-clx-new1908_1:
-      csit-vpp-perf-verify-1908_1-2n-clx:
-        - 5  # NDRPDR sel
-        - 6  # NDRPDR sel
-        - 7  # NDRPDR sel
-        - 8  # NDRPDR sel
-    vpp-perf-changes-2n-clx-new1908_2:
-      csit-vpp-perf-verify-1908_2-2n-clx:
-        - 4  # NDRPDR sel
-        - 5  # NDRPDR sel
-        - 6  # NDRPDR sel
-        - 7  # NDRPDR sel
-        - 8  # NDRPDR sel
-
     vpp-performance-changes-3n-hsw-h1:
-      csit-vpp-perf-verify-1904-3n-hsw:
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 26  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-ref:
       csit-vpp-perf-verify-1908-3n-hsw:
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
         - 19  # NDRPDR sel
         - 20  # NDRPDR sel
         - 21  # NDRPDR sel
-    vpp-performance-changes-3n-hsw-cmp:
+    vpp-performance-changes-3n-hsw-ref:
       csit-vpp-perf-verify-2001-3n-hsw:
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
         - 34  # NDRPDR sel
-
-    vpp-performance-changes-3n-skx-h1:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 8   # NDRPDR sel
-        - 9   # 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
-        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
         - 16  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 25  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-cmp-2:
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        - 20  # NDRPDR sel env 4
+        - 21  # NDRPDR sel env 4
+        - 22  # NDRPDR sel env 4
+        - 23  # NDRPDR sel env 4
+        - 24  # NDRPDR sel env 4
+        - 25  # NDRPDR sel env 4
+        - 26  # NDRPDR sel env 4
+        - 27  # NDRPDR sel env 4
+        - 28  # NDRPDR sel env 4
+        - 29  # NDRPDR sel env 4
+
+    vpp-performance-changes-3n-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-1908-3n-skx:
-        - 14  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 16  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 19  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 20  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 22  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 23  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 24  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 25  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 26  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 29  # NDRPDR sel - old1908 - vpp build: 19.08-release
-    vpp-performance-changes-3n-skx-cmp:
-      # TODO: Add the data
       csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 71  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 72  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 76  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 77  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 78  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 80  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+        - 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:
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        # TODO: Add data
+        - 42  # NDRPDR sel env 4
+        - 43  # NDRPDR sel env 4
 
     vpp-performance-changes-2n-skx-h1:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 12  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
+      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-1908-2n-skx:
-        - 26  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 27  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 34  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 35  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 36  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 42  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 43  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 44  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 45  # NDRPDR sel - old1908 - vpp build: 19.08-release
-        - 46  # NDRPDR sel - old1908 - vpp build: 19.08-release
-    vpp-performance-changes-2n-skx-cmp:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-
-    vpp-performance-changes-nfv-2n-skx-ref:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 22  # NFV
-        - 31  # NFV
-        - 32  # NFV
-    vpp-performance-changes-nfv-2n-skx-cmp:
-      # TODO: Add the data
       csit-vpp-perf-verify-2001-2n-skx:
-        - 30  # NFV
-        - 31  # NFV
+        - 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:
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        # TODO: Add data
+        - 88  # NDRPDR sel env 4
+        - 89  # NDRPDR sel env 4
+        - 90  # NDRPDR sel env 4
+        - 92  # NDRPDR sel env 4
+        - 93  # NDRPDR sel env 4
+
+#    vpp-performance-changes-nfv-2n-skx-ref:
+#      csit-vpp-perf-verify-2001-2n-skx:
+#        - 30  # NFV
+#        - 31  # NFV
+#    vpp-performance-changes-nfv-2n-skx-cmp:
+#      csit-vpp-perf-report-iterative-2005-2n-skx:
+#        - 43  # NDRPDR sel
+#        - 38  # NDRPDR sel
+#        - 7   # NDRPDR sel
+#        - 78  # nf-density-sel
+#        - 83  # nf-density-sel
 
-    vpp-performance-changes-2n-dnv-ref:
+    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:
+      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:
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 62  # NDRPDR sel env 4
+        - 63  # NDRPDR sel env 4
+        - 64  # NDRPDR sel env 4
+        - 66  # NDRPDR sel env 4
+
+    vpp-performance-changes-2n-dnv-h1:
       csit-vpp-perf-verify-1908-2n-dnv:
         - 1   # NDRPDR sel
         - 2   # NDRPDR sel
         - 8   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
-    vpp-performance-changes-2n-dnv-cmp:
+    vpp-performance-changes-2n-dnv-ref:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 11  # NDRPDR sel
         - 13  # NDRPDR sel
         - 16  # NDRPDR sel
+    vpp-performance-changes-2n-dnv-cmp:
+      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-ref:
+    vpp-performance-changes-3n-dnv-h1:
       csit-vpp-perf-verify-1908-3n-dnv:
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
         - 16  # NDRPDR sel
-    vpp-performance-changes-3n-dnv-cmp:
+    vpp-performance-changes-3n-dnv-ref:
       csit-vpp-perf-verify-2001-3n-dnv:
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
         - 18  # NDRPDR sel
+    vpp-performance-changes-3n-dnv-cmp:
+      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
 
-    vpp-performance-changes-3n-tsh-ref:
+    vpp-performance-changes-3n-tsh-h1:
       csit-vpp-perf-verify-1908-3n-tsh:
         - 7   # NDRPDR sel
         - 8   # NDRPDR sel
         - 14  # NDRPDR sel
         - 15  # NDRPDR sel
         - 16  # NDRPDR sel
-    vpp-performance-changes-3n-tsh-cmp:
+    vpp-performance-changes-3n-tsh-ref:
       csit-vpp-perf-verify-2001-3n-tsh:
         - 3   # NDRPDR sel
         - 4   # 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
+        - 21  # NDRPDR sel
+    vpp-performance-changes-3n-tsh-cmp-2:
+      # TODO: Add data:
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 23  # NDRPDR sel env 4
 
     vpp-soak-vs-ndr-2n-skx-ref:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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-soak-vs-ndr-2n-skx-cmp:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 181  # Soak
-        - 182  # Soak
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 49  # Soak
+        - 54  # Soak
     vpp-soak-vs-ndr-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 181  # Soak
-        - 182  # Soak
+      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
 
     vpp-soak-vs-ndr-2n-clx-ref:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
+      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
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # NDRPDR sel
+        - 50  # NDRPDR sel
+        - 51  # NDRPDR sel
     vpp-soak-vs-ndr-2n-clx-cmp:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 93  # SOAK
-        - 94  # Soak
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 44  # Soak
+        - 49  # Soak
     vpp-soak-vs-ndr-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
+      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
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # NDRPDR sel
-        - 93  # SOAK
-        - 94  # Soak
+        - 50  # NDRPDR sel
+        - 51  # NDRPDR sel
+        - 44  # Soak
+        - 49  # Soak
 
     vpp-performance-changes-3n-hsw-mrr-h1:
-      csit-vpp-perf-verify-1904-3n-hsw:
-        - 9   # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-verify-1908-3n-hsw:
         - 39  # MRR sel
-    vpp-performance-changes-3n-hsw-mrr-cmp:
+    vpp-performance-changes-3n-hsw-mrr-ref:
       csit-vpp-perf-verify-2001-3n-hsw:
         - 17  # MRR sel
+    vpp-performance-changes-3n-hsw-mrr-cmp:
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        - 13  # MRR
 
-    vpp-performance-changes-3n-skx-mrr-h1:
-      csit-vpp-perf-verify-1904-3n-skx:
-        - 7   # MRR sel
+#    vpp-performance-changes-3n-skx-mrr-h1:
+#      csit-vpp-perf-verify-1908-3n-skx:
+#        - 36  # MRR sel
     vpp-performance-changes-3n-skx-mrr-ref:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 36  # MRR sel
-    vpp-performance-changes-3n-skx-mrr-cmp:
       csit-vpp-perf-verify-2001-3n-skx:
         - 50  # MRR sel
         - 53  # MRR sel addition
+    vpp-performance-changes-3n-skx-mrr-cmp:
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        - 6   # MRR sel
 
-    vpp-performance-changes-2n-skx-mrr-h1:
-      csit-vpp-perf-verify-1904-2n-skx:
-        - 11  # MRR sel
+#    vpp-performance-changes-2n-skx-mrr-h1:
+#      csit-vpp-perf-verify-1908-2n-skx:
+#        - 69  # MRR sel
     vpp-performance-changes-2n-skx-mrr-ref:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 69  # MRR sel
-    vpp-performance-changes-2n-skx-mrr-cmp:
       csit-vpp-perf-verify-2001-2n-skx:
         - 101 # MRR sel
         - 128 # MRR sel addition
+    vpp-performance-changes-2n-skx-mrr-cmp:
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 42  # MRR sel
 
-    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:
-      # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 71  # NFV MRR
-
-    vpp-performance-changes-2n-dnv-mrr-ref:
+    vpp-performance-changes-2n-clx-mrr-ref:
+      csit-vpp-perf-verify-2001-2n-clx:
+        - 39  # MRR
+    vpp-performance-changes-2n-clx-mrr-cmp:
+      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
+
+    vpp-performance-changes-2n-dnv-mrr-h1:
       csit-vpp-perf-verify-1908-2n-dnv:
         - 11  # MRR sel
-    vpp-performance-changes-2n-dnv-mrr-cmp:
+    vpp-performance-changes-2n-dnv-mrr-ref:
       csit-vpp-perf-verify-2001-2n-dnv:
         - 12  # MRR sel
+    vpp-performance-changes-2n-dnv-mrr-cmp:
+      csit-vpp-perf-report-iterative-2005-2n-dnv:
+        - 15  # MRR sel
 
-    vpp-performance-changes-3n-dnv-mrr-ref:
+    vpp-performance-changes-3n-dnv-mrr-h1:
       csit-vpp-perf-verify-1908-3n-dnv:
         - 17  # MRR sel
-    vpp-performance-changes-3n-dnv-mrr-cmp:
+    vpp-performance-changes-3n-dnv-mrr-ref:
       csit-vpp-perf-verify-2001-3n-dnv:
         - 11  # MRR sel
+    vpp-performance-changes-3n-dnv-mrr-cmp:
+      csit-vpp-perf-report-iterative-2005-3n-dnv:
+        - 8   # MRR
 
-    vpp-performance-changes-3n-tsh-mrr-ref:
+    vpp-performance-changes-3n-tsh-mrr-h1:
       csit-vpp-perf-verify-1908-3n-tsh:
         - 17  # MRR sel
-    vpp-performance-changes-3n-tsh-mrr-cmp:
+    vpp-performance-changes-3n-tsh-mrr-ref:
       csit-vpp-perf-verify-2001-3n-tsh:
         - 9   # MRR sel
+    vpp-performance-changes-3n-tsh-mrr-cmp:
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 10  # MRR sel
 
     dpdk-performance-changes-3n-hsw-h1:
-      csit-dpdk-perf-verify-1904-3n-hsw:
+      csit-dpdk-perf-verify-1908-3n-hsw:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
-        - 13  # NDRPDR sel
-        - 14  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # 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-1908-3n-hsw:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
+      csit-dpdk-perf-verify-2001-3n-hsw:
         - 4   # NDRPDR sel
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 9   # NDRPDR sel
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
-    dpdk-performance-changes-3n-hsw-cmp:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-#        - 4   # NDRPDR sel
-#        - 5   # NDRPDR sel
-#        - 6   # NDRPDR sel
-#        - 7   # NDRPDR sel
-#        - 8   # NDRPDR sel
-#        - 9   # NDRPDR sel
-#        - 10  # NDRPDR sel
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
         - 15  # NDRPDR sel
         - 16  # NDRPDR sel
         - 17  # NDRPDR sel
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
-
-    dpdk-performance-changes-3n-skx-h1:
-      csit-dpdk-perf-verify-1904-3n-skx:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 4   # NDRPDR sel
+    dpdk-performance-changes-3n-hsw-cmp:
+      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
-    dpdk-performance-changes-3n-skx-ref:
+
+    dpdk-performance-changes-3n-skx-h1:
       csit-dpdk-perf-verify-1908-3n-skx:
         - 3   # NDRPDR sel
         - 4   # NDRPDR sel
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-    dpdk-performance-changes-3n-skx-cmp:
+    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-2n-skx-h1:
-      csit-dpdk-perf-verify-1904-2n-skx:
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
+    dpdk-performance-changes-3n-skx-cmp:
+      csit-dpdk-perf-report-iterative-2005-3n-skx:
         - 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-2n-skx-ref:
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+
+    dpdk-performance-changes-2n-skx-h1:
       csit-dpdk-perf-verify-1908-2n-skx:
         - 2   # NDRPDR sel
         - 3   # NDRPDR sel
         - 10  # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
-    dpdk-performance-changes-2n-skx-cmp:
+    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:
+      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
 
-    # Compare testbeds
-
-    vpp-compare-testbeds-ref:
-      csit-vpp-perf-verify-2001-3n-hsw:
+    dpdk-performance-changes-2n-clx-ref:
+      csit-dpdk-perf-verify-2001-2n-clx:
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
         - 21  # NDRPDR sel
         - 22  # NDRPDR sel
         - 23  # NDRPDR sel
         - 24  # NDRPDR sel
         - 25  # NDRPDR sel
+        - 26  # NDRPDR sel
+        - 27  # NDRPDR sel
+        - 28  # NDRPDR sel
         - 29  # NDRPDR sel
         - 30  # NDRPDR sel
         - 31  # NDRPDR sel
         - 32  # NDRPDR sel
+        - 33  # NDRPDR sel
         - 34  # NDRPDR sel
+    dpdk-performance-changes-2n-clx-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
+
+    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:
+      csit-dpdk-perf-verify-2001-3n-tsh:
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 18  # NDRPDR sel
+    dpdk-performance-changes-3n-tsh-cmp:
+      csit-dpdk-perf-report-iterative-2005-3n-tsh:
+        - 5   # NDRPDR sel
+
+    # 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
     vpp-compare-testbeds-cmp:
-      # TODO: Add the data
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 71  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 72  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 76  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 77  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 78  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 80  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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-compare-testbeds-skx-clx-ref:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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-compare-testbeds-skx-clx-cmp:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
+      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
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # NDRPDR sel
+        - 50  # NDRPDR sel
+        - 51  # NDRPDR sel
 
     vpp-compare-testbeds-hsw-clx-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
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        -   # NDRPDR sel
+        -   # NDRPDR sel
+        -   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
     vpp-compare-testbeds-hsw-clx-cmp:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
+      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
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
-        - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # NDRPDR sel
+        - 50  # NDRPDR sel
+        - 51  # NDRPDR sel
 
     vpp-compare-testbeds-mrr-ref:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 17  # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        - 13  # MRR
     vpp-compare-testbeds-mrr-cmp:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 50  # MRR sel
-        - 53  # MRR sel addition
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        - 6   # MRR sel
 
     vpp-compare-testbeds-mrr-skx-clx-ref:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 101 # MRR sel
-        - 128 # MRR sel addition
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 42  # MRR sel
     vpp-compare-testbeds-mrr-skx-clx-cmp:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 39  # MRR
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 12   # MRR
 
     vpp-compare-testbeds-mrr-hsw-clx-ref:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 17  # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        - 13  # MRR
     vpp-compare-testbeds-mrr-hsw-clx-cmp:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 39  # MRR
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 12   # MRR
 
     dpdk-compare-testbeds-ref:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-        - 4   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-hsw:
         - 5   # NDRPDR sel
         - 6   # NDRPDR sel
         - 7   # NDRPDR sel
         - 11  # NDRPDR sel
         - 12  # NDRPDR sel
         - 13  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
+        - 14  # NDRPDR sel
     dpdk-compare-testbeds-cmp:
-      csit-dpdk-perf-verify-2001-3n-skx:
-        - 29  # NDRPDR sel xxv710
-        - 33  # NDRPDR sel xxv710
-        - 34  # NDRPDR sel xxv710
-        - 35  # NDRPDR sel xxv710
-        - 36  # NDRPDR sel xxv710
-        - 37  # NDRPDR sel xxv710
-        - 41  # NDRPDR sel xxv710
-        - 42  # NDRPDR sel xxv710
-        - 43  # NDRPDR sel xxv710
-        - 45  # NDRPDR sel xxv710
-        - 30  # NDRPDR sel x710
-        - 31  # NDRPDR sel x710
-        - 32  # NDRPDR sel x710
-        - 38  # NDRPDR sel x710
-        - 39  # NDRPDR sel x710
-        - 40  # NDRPDR sel x710
-        - 44  # NDRPDR sel x710
-        - 46  # NDRPDR sel x710
-        - 47  # NDRPDR sel x710
-        - 48  # NDRPDR sel x710
+      csit-dpdk-perf-report-iterative-2005-3n-skx:
+        - 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
 
     dpdk-compare-testbeds-skx-clx-ref:
-      csit-dpdk-perf-verify-2001-2n-skx:
-        - 35  # NDRPDR sel xxv710
-        - 36  # NDRPDR sel xxv710
-        - 37  # NDRPDR sel xxv710
-        - 41  # NDRPDR sel xxv710
-        - 42  # NDRPDR sel xxv710
-        - 43  # NDRPDR sel xxv710
-        - 46  # NDRPDR sel xxv710
-        - 47  # NDRPDR sel xxv710
-        - 52  # NDRPDR sel xxv710
-        - 53  # NDRPDR sel xxv710
-        - 38  # NDRPDR sel x710
-        - 39  # NDRPDR sel x710
-        - 40  # NDRPDR sel x710
-        - 44  # NDRPDR sel x710
-        - 45  # NDRPDR sel x710
-        - 48  # NDRPDR sel x710
-        - 49  # NDRPDR sel x710
-        - 50  # NDRPDR sel x710
-        - 51  # NDRPDR sel x710
-        - 54  # NDRPDR sel x710
+      csit-dpdk-perf-report-iterative-2005-2n-skx:
+        - 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-compare-testbeds-skx-clx-cmp:
-      csit-dpdk-perf-verify-2001-2n-clx:
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
-        - 25  # NDRPDR sel
-        - 26  # NDRPDR sel
-        - 27  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 31  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 33  # NDRPDR sel
-        - 34  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-2n-clx:
+        - 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
 
     # Compare topologies
 
     vpp-compare-topologies-ref:
-      # TODO: Add the data
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 71  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 72  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 76  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 77  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 78  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 80  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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-compare-topologies-cmp:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-        - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      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-compare-topologies-mrr-ref:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 50  # MRR sel
-        - 53  # MRR sel addition
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        - 6   # MRR sel
     vpp-compare-topologies-mrr-cmp:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 101 # MRR sel
-        - 128 # MRR sel addition
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 42  # MRR sel
 
     dpdk-compare-topologies-ref:
-      csit-dpdk-perf-verify-2001-3n-skx:
-        - 29  # NDRPDR sel xxv710
-        - 33  # NDRPDR sel xxv710
-        - 34  # NDRPDR sel xxv710
-        - 35  # NDRPDR sel xxv710
-        - 36  # NDRPDR sel xxv710
-        - 37  # NDRPDR sel xxv710
-        - 41  # NDRPDR sel xxv710
-        - 42  # NDRPDR sel xxv710
-        - 43  # NDRPDR sel xxv710
-        - 45  # NDRPDR sel xxv710
-        - 30  # NDRPDR sel x710
-        - 31  # NDRPDR sel x710
-        - 32  # NDRPDR sel x710
-        - 38  # NDRPDR sel x710
-        - 39  # NDRPDR sel x710
-        - 40  # NDRPDR sel x710
-        - 44  # NDRPDR sel x710
-        - 46  # NDRPDR sel x710
-        - 47  # NDRPDR sel x710
-        - 48  # NDRPDR sel x710
+      csit-dpdk-perf-report-iterative-2005-3n-skx:
+        - 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
     dpdk-compare-topologies-cmp:
-      csit-dpdk-perf-verify-2001-2n-skx:
-        - 35  # NDRPDR sel xxv710
-        - 36  # NDRPDR sel xxv710
-        - 37  # NDRPDR sel xxv710
-        - 41  # NDRPDR sel xxv710
-        - 42  # NDRPDR sel xxv710
-        - 43  # NDRPDR sel xxv710
-        - 46  # NDRPDR sel xxv710
-        - 47  # NDRPDR sel xxv710
-        - 52  # NDRPDR sel xxv710
-        - 53  # NDRPDR sel xxv710
-        - 38  # NDRPDR sel x710
-        - 39  # NDRPDR sel x710
-        - 40  # NDRPDR sel x710
-        - 44  # NDRPDR sel x710
-        - 45  # NDRPDR sel x710
-        - 48  # NDRPDR sel x710
-        - 49  # NDRPDR sel x710
-        - 50  # NDRPDR sel x710
-        - 51  # NDRPDR sel x710
-        - 54  # NDRPDR sel x710
+      csit-dpdk-perf-report-iterative-2005-2n-skx:
+        - 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
 
   plot-layouts:
 
       hoverlabel:
         namelength: -1
 
-    plot-cps:
+    plot-hoststack:
       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>Connections Per Second [cps]</b>"
+        title: "<b>Bandwidth [Gbps]</b>"
         titlefont:
-          size: 16
+          size: 14
         gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
         linecolor: "rgb(220, 220, 220)"
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
+        tickcolor: "rgb(230, 230, 230)"
         tickformat: ".3s"
         tickfont:
-          size: 16
+          size: 14
         zeroline: False
       boxmode: "group"
       boxgroupgap: 0.5
       legend:
         orientation: "h"
         font:
-          size: 16
+          size: 14
       width: 700
       height: 800
       paper_bgcolor: "#fff"
       hoverlabel:
         namelength: -1
 
-    plot-rps:
+    plot-throughput:
       titlefont:
         size: 18
       xaxis:
           size: 16
         zeroline: False
       yaxis:
-        title: "<b>Requests Per Second [rps]</b>"
+        title: "<b>Packet Throughput [Mpps]</b>"
         titlefont:
           size: 16
         gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
+        hoverformat: ".4r"
+        tickformat: ".3r"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
-        rangemode: "tozero"
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(230, 230, 230)"
-        tickformat: ".3s"
+        tickcolor: "rgb(220, 220, 220)"
         tickfont:
           size: 16
         zeroline: False
-      boxmode: "group"
-      boxgroupgap: 0.5
+        range: [0,50]
       autosize: False
       margin:
         t: 50
-        b: 20
+        b: 0
         l: 80
         r: 20
       showlegend: True
         font:
           size: 16
       width: 700
-      height: 800
+      height: 900
       paper_bgcolor: "#fff"
       plot_bgcolor: "#fff"
       hoverlabel:
         namelength: -1
 
-    plot-hoststack:
+    plot-throughput-speedup-analysis:
       titlefont:
-        size: 16
+        size: 18
       xaxis:
-        title: "<b>Test Cases [Index]</b>"
+        title: "<b>Number of Cores [Qty]</b>"
         titlefont:
-          size: 14
+          size: 16
         autorange: True
         fixedrange: False
         gridcolor: "rgb(230, 230, 230)"
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
+        tickcolor: "rgb(238, 238, 238)"
         tickmode: "linear"
         tickfont:
-          size: 14
+          size: 16
         zeroline: False
       yaxis:
-        title: "<b>Bandwidth [Gbps]</b>"
+        title: "<b>Packet Throughput [Mpps]</b>"
         titlefont:
-          size: 14
+          size: 16
+        type: "linear"
         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"
+        tickcolor: "rgb(220, 220, 220)"
+        tickformat: ".4s"
         tickfont:
-          size: 14
-        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: 14
-      width: 700
-      height: 800
-      paper_bgcolor: "#fff"
-      plot_bgcolor: "#fff"
-      hoverlabel:
-        namelength: -1
-
-    plot-throughput:
-      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>Packet Throughput [Mpps]</b>"
-        titlefont:
-          size: 16
-        gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4r"
-        tickformat: ".3r"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickfont:
-          size: 16
-        zeroline: False
-        range: [0,50]
-      autosize: False
-      margin:
-        t: 50
-        b: 0
-        l: 80
-        r: 20
-      showlegend: True
-      legend:
-        orientation: "h"
-        font:
-          size: 16
-      width: 700
-      height: 900
-      paper_bgcolor: "#fff"
-      plot_bgcolor: "#fff"
-      hoverlabel:
-        namelength: -1
-
-    plot-throughput-speedup-analysis:
-      titlefont:
-        size: 18
-      xaxis:
-        title: "<b>Number of Cores [Qty]</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(238, 238, 238)"
-        tickmode: "linear"
-        tickfont:
-          size: 16
-        zeroline: False
-      yaxis:
-        title: "<b>Packet Throughput [Mpps]</b>"
-        titlefont:
-          size: 16
-        type: "linear"
-        gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickformat: ".4s"
-        tickfont:
-          size: 16
-        zeroline: True
-        rangemode: "tozero"
-        range: [0,100]
+          size: 16
+        zeroline: True
+        rangemode: "tozero"
+        range: [0,100]
       legend:
         orientation: "h"
         font:
 
   builds:
 
-    csit-vpp-perf-verify-1904-3n-hsw:
-      - 9   # MRR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 26  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 30  # NDRPDR sel
     csit-vpp-perf-verify-1908-3n-hsw:
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
-      - 48  # NDRPDR sel vhost
-      - 49  # NDRPDR sel vhost
-      - 52  # NDRPDR sel vhost
-      - 53  # NDRPDR sel vhost
-      - 54  # NDRPDR sel vhost
-      - 55  # NDRPDR sel vhost
-      - 56  # NDRPDR sel vhost
-      - 57  # NDRPDR sel vhost
-      - 58  # NDRPDR sel vhost
-      - 59  # NDRPDR sel vhost
       - 39  # MRR sel
     csit-vpp-perf-verify-2001-3n-hsw:
       - 21  # NDRPDR sel
       - 32  # NDRPDR sel
       - 34  # NDRPDR sel
       - 17  # MRR sel
-      - 18  # NDRPDR full
-      - 20  # NDRPDR full
-      - 28  # NDRPDR full
-      - 35  # NDRPDR full
-      - 42  # NDRPDR full
-      - 46  # NDRPDR full
-      - 47  # NDRPDR full
-      - 48  # NDRPDR full
-      - 49  # NDRPDR full
-      - 50  # NDRPDR full
-      - 51  # NDRPDR full
-      - 52  # NDRPDR full
-      - 53  # NDRPDR full
-      - 54  # NDRPDR full
-      - 55  # NDRPDR full
-      - 56  # NDRPDR full
-      - 57  # NDRPDR full
-      - 58  # NDRPDR full
-      - 59  # NDRPDR full
-      - 61  # NDRPDR full
-      - 62  # NDRPDR full
-      - 63  # NDRPDR full
-      - 64  # NDRPDR full
-      - 65  # NDRPDR full
-      - 67  # NDRPDR full
-      - 70  # NDRPDR full
-      - 72  # NDRPDR full
-      - 73  # NDRPDR full
-      - 76  # NDRPDR full
-      - 77  # NDRPDR full
-      - 78  # NDRPDR full
-      - 79  # NDRPDR full
-      - 81  # NDRPDR full
-      - 82  # NDRPDR full
-      - 84  # NDRPDR full
-      - 85  # NDRPDR full
-      - 103  # hoststack
-      - 104  # hoststack
-      - 105  # hoststack
-      - 106  # hoststack
-      - 107  # hoststack
-      - 108  # hoststack
-      - 109  # hoststack
-      - 110  # hoststack
-      - 111  # hoststack
-      - 112  # hoststack
-
-    csit-vpp-perf-verify-1904-3n-skx:
-      - 7   # MRR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR 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
-      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
       - 16  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-    csit-vpp-perf-verify-1908-3n-skx:
-      - 14  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 16  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 19  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 20  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 22  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 23  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 24  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 25  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 26  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 29  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 52  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 53  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 55  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 61  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 62  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 63  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 64  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 65  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 66  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 67  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 36  # MRR sel - old1908 - vpp build: 19.08-release
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 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
+      - 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:
-      - 3   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 4   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 7   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 8   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 9   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 10  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 11  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 12  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 13  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 14  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 26  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 27  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 28  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 29  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 30  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 31  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 33  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 34  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 35  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 36  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-    csit-vpp-perf-verify-1908_2-3n-skx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
+      - 26  # NDRPDR sel - new1908.1
+      - 27  # NDRPDR sel - new1908.1
+      - 28  # NDRPDR sel - new1908.1
+      - 29  # NDRPDR sel - new1908.1
+      - 30  # NDRPDR sel - new1908.1
+      - 31  # NDRPDR sel - new1908.1
+      - 33  # NDRPDR sel - new1908.1
+      - 34  # NDRPDR sel - new1908.1
+      - 35  # NDRPDR sel - new1908.1
+      - 36  # NDRPDR sel - new1908.1
     csit-vpp-perf-verify-2001-3n-skx:
-      - 69  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 71  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 72  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 76  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 77  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 78  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 80  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 82  # NDRPDR full - crypto-1
-      - 85  # NDRPDR full - l2-2
-      - 87  # NDRPDR full - ip6-1
-      - 88  # NDRPDR full - ip6-2
-      - 90  # NDRPDR full - memif
-      - 95  # NDRPDR full - l2-1
-      - 96  # NDRPDR full - ip4-2
-      - 97  # NDRPDR full - vhost-1
-      - 102 # NDRPDR full - crypto-2
-      - 104 # NDRPDR full - ip4tunnels-1
-      - 105 # NDRPDR full - ip4tunnels-2
-      - 106 # NDRPDR full - ip4tunnels-3
-      - 107 # NDRPDR full - ip6tunnels-1
-      - 108 # NDRPDR full - ip4-1
+      - 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:
+      - 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
+      - 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
+      - 21  # perf-full-3n-skx-ip4tunnels-I
+      - 22  # perf-full-3n-skx-ip4tunnels-II
+      - 23  # perf-full-3n-skx-ip4tunnels-III
+      - 26  # perf-full-3n-skx-ip6tunnels-I
+      - 28  # perf-full-3n-skx-l2_II
+      - 29  # perf-full-3n-skx-l2_III
+      - 30  # perf-full-3n-skx-l2_IV
+      - 32  # perf-full-3n-skx-l2_VI
+      - 33  # perf-full-3n-skx-l2_VII
+      - 34  # perf-full-3n-skx-l2_VIII
+      - 35  # perf-full-3n-skx-l2_IX
+      - 36  # perf-full-3n-skx-l2_X
+      - 37  # perf-full-3n-skx-l2_XI
+      - 38  # perf-full-3n-skx-memif
+      - 39  # perf-full-3n-skx-srv6-I
+      - 40  # perf-full-3n-skx-srv6-II
+      - 43  # perf-full-3n-skx-vhost-III
 
-    csit-vpp-perf-verify-1904-2n-skx:
-      - 11  # MRR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 27  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 32  # NDRPDR sel
-    csit-vpp-perf-verify-1908-2n-skx:
-      - 26  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 27  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 34  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 35  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 36  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 42  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 43  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 44  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 45  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 46  # NDRPDR sel - old1908 - vpp build: 19.08-release
-      - 88  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 89  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 91  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 92  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 93  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 94  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 95  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 96  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 97  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 98  # NDRPDR sel vhost - old1908 - vpp build: 19.08-release
-      - 69  # MRR sel - old1908 - vpp build: 19.08-release
     csit-vpp-perf-verify-1908_1-2n-skx:
-      - 3   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 4   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 6   # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 10  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 14  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 16  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 21  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 23  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 24  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 25  # NDRPDR sel - old1908.1 - vpp build: 19.08.1-release, old BIOS and ucode
-      - 39  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 40  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 41  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 43  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 44  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 45  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 46  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 47  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 48  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-      - 49  # NDRPDR sel - new1908.1 - vpp build: 19.08.1-release, new BIOS and ucode, irqbalance set
-    csit-vpp-perf-verify-1908_2-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
+      - 39  # NDRPDR sel - new1908.1
+      - 40  # NDRPDR sel - new1908.1
+      - 41  # NDRPDR sel - new1908.1
+      - 43  # NDRPDR sel - new1908.1
+      - 44  # NDRPDR sel - new1908.1
+      - 45  # NDRPDR sel - new1908.1
+      - 46  # NDRPDR sel - new1908.1
+      - 47  # NDRPDR sel - new1908.1
+      - 48  # NDRPDR sel - new1908.1
+      - 49  # NDRPDR sel - new1908.1
     csit-vpp-perf-verify-2001-2n-skx:
-      - 143  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 146  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 147  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 148  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 149  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 150  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 151  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 152  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 153  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 154  # NDRPDR sel - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 155  # NDRPDR full - perf-full-2n-skx-ip4_I - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 156  # NDRPDR full - perf-full-2n-skx-ip4_II - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 157  # NDRPDR full - perf-full-2n-skx-ip4_III - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 158  # NDRPDR full - perf-full-2n-skx-ip4_V - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 159  # NDRPDR full - perf-full-2n-skx-ip4_VIII - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 160  # NDRPDR full - perf-full-2n-skx-ip4_IX - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 161  # NDRPDR full - perf-full-2n-skx-ip6_I - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 162  # NDRPDR full - perf-full-2n-skx-ip6_II - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 163  # NDRPDR full - perf-full-2n-skx-l2_I - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 164  # NDRPDR full - perf-full-2n-skx-l2_II - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 165  # NDRPDR full - perf-full-2n-skx-memif - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 166  # NDRPDR full - perf-full-2n-skx-vhost I - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 167  # NDRPDR full - perf-full-2n-skx-vhost II - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
-      - 168  # NDRPDR full - perf-full-2n-skx-vts - new2001.0 - vpp build: 20.01.0-release, new BIOS and ucode, irqbalance set
+      - 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
-      - 169  # Reconf
-      - 171  # Reconf
-      - 172  # Reconf
-      - 173  # Reconf
-      - 174  # Reconf
-      - 175  # Reconf
-      - 176  # Reconf
-      - 177  # Reconf
-      - 178  # Reconf
-      - 179  # Reconf
-      - 181  # Soak
-      - 182  # Soak
+    csit-vpp-perf-report-iterative-2005-2n-skx:
+      - 43  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 65  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 55  # NDRPDR sel
+      - 67  # NDRPDR sel
+      - 75  # NDRPDR sel
+      - 76  # NDRPDR sel
+      - 73  # NDRPDR sel
+      - 88  # NDRPDR sel env 4
+      - 89  # NDRPDR sel env 4
+      - 90  # NDRPDR sel env 4
+      - 92  # NDRPDR sel env 4
+      - 93  # NDRPDR sel env 4
+      - 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
+      - 78  # nf-density-sel
+      - 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
-    csit-vpp-perf-verify-1908_2-2n-clx:
-      - 4  # NDRPDR sel
-      - 5  # NDRPDR sel
-      - 6  # NDRPDR sel
-      - 7  # NDRPDR sel
-      - 8  # NDRPDR sel
+      - 9  # NDRPDR sel
     csit-vpp-perf-verify-2001-2n-clx:
       - 28  # NDRPDR sel
       - 29  # NDRPDR sel
       - 48  # NDRPDR sel
       - 49  # NDRPDR sel
       - 39  # MRR
-      - 53  # NDRPDR full
-      - 54  # NDRPDR full
-      - 55  # NDRPDR full
-      - 56  # NDRPDR full
-      - 57  # NDRPDR full
-      - 58  # NDRPDR full
-      - 59  # NDRPDR full
-      - 60  # NDRPDR full
-      - 61  # NDRPDR full
-      - 62  # NDRPDR full
-      - 63  # NDRPDR full
-      - 64  # NDRPDR full
-      - 65  # NDRPDR full
-      - 66  # NDRPDR full
-      - 67  # NDRPDR full
-      - 68  # Reconf
-      - 69  # Reconf
-      - 70  # Reconf
-      - 71  # Reconf
-      - 72  # Reconf
-      - 73  # Reconf
-      - 74  # Reconf
-      - 75  # Reconf
-      - 76  # Reconf
-      - 77  # Reconf
-      - 80  # TCP
-      - 82  # TCP
-      - 83  # TCP
-      - 85  # TCP
-      - 86  # TCP
-      - 87  # TCP
-      - 88  # TCP
-      - 89  # TCP
-      - 90  # TCP
-      - 91  # TCP
-      - 93  # Soak
-      - 94  # Soak
+    csit-vpp-perf-report-iterative-2005-2n-clx:
+      - 7   # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 32  # NDRPDR sel ???
+      - 33  # NDRPDR sel ???
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 51  # NDRPDR sel
+      - 62  # NDRPDR sel env 4
+      - 63  # NDRPDR sel env 4
+      - 64  # NDRPDR sel env 4
+      - 66  # NDRPDR sel env 4
+      - 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
       - 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
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel env 4
+      - 10  # MRR sel
 
     csit-vpp-perf-verify-1908-3n-dnv:
       - 6   # NDRPDR sel
       - 17  # NDRPDR sel
       - 18  # NDRPDR sel
       - 11  # MRR sel
-      - 19  # NDRPDR full
-      - 20  # NDRPDR full
-      - 21  # NDRPDR full
-      - 22  # NDRPDR full
-      - 23  # NDRPDR full
-      - 24  # NDRPDR full
-      - 25  # NDRPDR full
-      - 26  # NDRPDR full
-      - 37  # NDRPDR full
-      - 38  # NDRPDR full
-      - 39  # NDRPDR full
+    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
       - 13  # NDRPDR sel
       - 16  # NDRPDR sel
       - 12  # MRR sel
-      - 21  # NDRPDR full
-      - 22  # NDRPDR full
-      - 25  # NDRPDR full
-      - 26  # NDRPDR full
-      - 27  # NDRPDR full
-      - 28  # NDRPDR full
-
-    csit-dpdk-perf-verify-1904-3n-hsw:
-      - 2   # NDRPDR sel
+    csit-vpp-perf-report-iterative-2005-2n-dnv:
       - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # 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
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
-      - 25  # NDRPDR full
-      - 26  # NDRPDR full
-
-    csit-dpdk-perf-verify-1904-3n-skx:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
-      - 4   # 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
+
     csit-dpdk-perf-verify-1908-3n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
       - 46  # NDRPDR sel x710
       - 47  # NDRPDR sel x710
       - 48  # NDRPDR sel x710
-
-    csit-dpdk-perf-verify-1904-2n-skx:
-      - 2   # NDRPDR sel
-      - 3   # NDRPDR sel
+    csit-dpdk-perf-report-iterative-2005-3n-skx:
       - 4   # NDRPDR sel
       - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+
     csit-dpdk-perf-verify-1908-2n-skx:
       - 2   # NDRPDR sel
       - 3   # NDRPDR sel
       - 50  # NDRPDR sel x710
       - 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
 
     csit-dpdk-perf-verify-2001-2n-clx:
       - 15  # NDRPDR sel
       - 32  # 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
       - 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
       - 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
 
     csit-dpdk-perf-verify-2001-3n-tsh:
       - 3   # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 18  # NDRPDR sel
+    csit-dpdk-perf-report-iterative-2005-3n-tsh:
+      - 5   # NDRPDR sel
 
-    csit-vpp-device-2001-ubuntu1804-1n-skx:
-      - 57
+    csit-vpp-device-2005-ubuntu1804-1n-skx:
+      - 35
 
 - type: "output"
   output: "report"
     - "x710, xxv710 - NICs tested."
     - "Diff - difference between x710 and xxv710 NIC."
 
-# VPP Compare NICs 3n-skx 2t1c mrr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
-      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 mrr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
-      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 8t4c mrr
-- type: "table"
-  title: "VPP Compare NICs 3n-skx 8t4c mrr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
-  columns:
-    - title: "x710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
-      tag: "NIC_Intel-X710"
-    - title: "xxv710"
-      data-set: "vpp-nic-comparison-3n-skx-mrr"
-      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 mrr
+#- type: "table"
+#  title: "VPP Compare NICs 3n-skx 2t1c mrr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
+#  columns:
+#    - title: "x710"
+#      data-set: "vpp-nic-comparison-3n-skx-mrr"
+#      tag: "NIC_Intel-X710"
+#    - title: "xxv710"
+#      data-set: "vpp-nic-comparison-3n-skx-mrr"
+#      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 mrr
+#- type: "table"
+#  title: "VPP Compare NICs 3n-skx 4t2c mrr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
+#  columns:
+#    - title: "x710"
+#      data-set: "vpp-nic-comparison-3n-skx-mrr"
+#      tag: "NIC_Intel-X710"
+#    - title: "xxv710"
+#      data-set: "vpp-nic-comparison-3n-skx-mrr"
+#      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 8t4c mrr
+#- type: "table"
+#  title: "VPP Compare NICs 3n-skx 8t4c mrr"
+#  algorithm: "table_comparison"
+#  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
+#  columns:
+#    - title: "x710"
+#      data-set: "vpp-nic-comparison-3n-skx-mrr"
+#      tag: "NIC_Intel-X710"
+#    - title: "xxv710"
+#      data-set: "vpp-nic-comparison-3n-skx-mrr"
+#      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 2n-skx 2t1c ndr
 - type: "table"
 ################################################################################
 # VPP
 
-# VPP Performance changes 2n-skx-xxv710 2t1c ndr
-- type: "table"
-  title: "VPP Performance changes 2n-skx-xxv710 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-2n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1"
-      data-set: "vpp-perf-changes-2n-skx-new1908_1"
-    - title: "1908.2"
-      data-set: "vpp-perf-changes-2n-skx-new1908_2"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "1908.1, 1908.2 - VPP versions tested."
-    - "Diff - difference between the previous and the current VPP version."
-
-# VPP Performance changes 2n-skx-xxv710 2t1c pdr
-- type: "table"
-  title: "VPP Performance changes 2n-skx-xxv710 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-2n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1"
-      data-set: "vpp-perf-changes-2n-skx-new1908_1"
-    - title: "1908.2"
-      data-set: "vpp-perf-changes-2n-skx-new1908_2"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "1908.1, 1908.2 - VPP versions tested."
-    - "Diff - difference between the previous and the current VPP version."
-
-# VPP Performance changes 3n-skx-xxv710 2t1c ndr
-- type: "table"
-  title: "VPP Performance changes 3n-skx-xxv710 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-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"
-      data-set: "vpp-perf-changes-3n-skx-new1908_1"
-    - title: "1908.2"
-      data-set: "vpp-perf-changes-3n-skx-new1908_2"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "1908.1, 1908.2 - VPP versions tested."
-    - "Diff - difference between the previous and the current VPP version."
-
-# VPP Performance changes 3n-skx-xxv710 2t1c pdr
-- type: "table"
-  title: "VPP Performance changes 3n-skx-xxv710 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-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"
-      data-set: "vpp-perf-changes-3n-skx-new1908_1"
-    - title: "1908.2"
-      data-set: "vpp-perf-changes-3n-skx-new1908_2"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "1908.1, 1908.2 - VPP versions tested."
-    - "Diff - difference between the previous and the current VPP version."
-
-# VPP Performance changes 2n-clx-xxv710 2t1c ndr
-- type: "table"
-  title: "VPP Performance changes 2n-clx-xxv710 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-2n-clx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1"
-      data-set: "vpp-perf-changes-2n-clx-new1908_1"
-    - title: "1908.2"
-      data-set: "vpp-perf-changes-2n-clx-new1908_2"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "1908.1, 1908.2 - VPP versions tested."
-    - "Diff - difference between the previous and the current VPP version."
-
-# VPP Performance changes 2n-clx-xxv710 2t1c pdr
-- type: "table"
-  title: "VPP Performance changes 2n-clx-xxv710 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-1908_2-2n-clx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  columns:
-    - title: "1908.1"
-      data-set: "vpp-perf-changes-2n-clx-new1908_1"
-    - title: "1908.2"
-      data-set: "vpp-perf-changes-2n-clx-new1908_2"
-  comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
-  legend:
-    - "Legend to Table:"
-    - "1908.1, 1908.2 - VPP versions tested."
-    - "Diff - difference between the previous and the current VPP version."
-
 # VPP Performance Changes 3n-hsw 1t1c pdr
 - type: "table"
   title: "VPP Performance Changes 3n-hsw 1t1c pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # 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: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # 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: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # 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: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-hsw-cmp"
-  comparisons:
-    - title: "Diff"
-      reference: 2
-      compare: 3
-  legend:
-    - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
-
-# VPP Root Cause Analysis 3n-skx-xxv710 2t1c pdr
-- type: "table"
-  title: "VPP Root Cause Analysis 3n-skx-xxv710 2t1c pdr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-rca-3n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  rca:
-    - title: "RCA1"
-      data: "rca/rca-3n-skx-2t1c-pdr-rca1.yaml"
-    - title: "RCA2"
-      data: "rca/rca-3n-skx-2t1c-pdr-rca2.yaml"
-  columns:
-    - title: "1908.0-1"
-      data-set: "vpp-perf-changes-3n-skx-old1908_0"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-    - title: "1908.1-1"
-      data-set: "vpp-perf-changes-3n-skx-old1908_1"
-    - title: "1908.1-2"
-      data-set: "vpp-perf-changes-3n-skx-new1908_1"
-    - title: "2001.0-2"
-      data-set: "vpp-perf-changes-3n-skx-new2001_0"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-hsw-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 2
-      reference-alt: 1
+      reference: 4
       compare: 3
     - title: "Diff2"
-      reference: 3
-      compare: 4
-  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, "1" for 2019-08-21, "2" for 2020-03-27).'
-    - 'Diff1 - difference between environment versions "2" and "1" for the same VPP version, 1908.1-2 vs. 1908.1-1 (if data for the latter not present, 1908.0-1 is used).'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2001.0-2 vs. 1908.1-2.'
-    - 'RCA1 - root cause analysis reference for Diff1.'
-    - 'RCA2 - root cause analysis reference for Diff2.'
-
-# VPP Root Cause Analysis 3n-skx-xxv710 2t1c ndr
-- type: "table"
-  title: "VPP Root Cause Analysis 3n-skx-xxv710 2t1c ndr"
-  algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-rca-3n-skx-2t1c-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  rca:
-    - title: "RCA1"
-      data: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
-    - title: "RCA2"
-      data: "rca/rca-3n-skx-2t1c-ndr-rca2.yaml"
-  columns:
-    - title: "1908.0-1"
-      data-set: "vpp-perf-changes-3n-skx-old1908_0"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-    - title: "1908.1-1"
-      data-set: "vpp-perf-changes-3n-skx-old1908_1"
-    - title: "1908.1-2"
-      data-set: "vpp-perf-changes-3n-skx-new1908_1"
-    - title: "2001.0-2"
-      data-set: "vpp-perf-changes-3n-skx-new2001_0"
-  comparisons:
-    - title: "Diff1"
       reference: 2
-      reference-alt: 1
-      compare: 3
-    - title: "Diff2"
-      reference: 3
       compare: 4
+#  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"
   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, "1" for 2019-08-21, "2" for 2020-03-27).'
-    - 'Diff1 - difference between environment versions "2" and "1" for the same VPP version, 1908.1-2 vs. 1908.1-1 (if data for the latter not present, 1908.0-1 is used).'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2001.0-2 vs. 1908.1-2.'
-    - 'RCA1 - root cause analysis reference for Diff1.'
-    - 'RCA2 - root cause analysis reference for Diff2.'
+    - "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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 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"
   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 not 'NF_DENSITY'"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-      tag: "NIC_Intel-X710"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-      tag: "NIC_Intel-XXV710"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-skx-cmp"
-      tag: "NIC_Intel-XXV710"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 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"
   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 not 'NF_DENSITY'"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-      tag: "NIC_Intel-X710"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-      tag: "NIC_Intel-XXV710"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-skx-cmp"
-      tag: "NIC_Intel-XXV710"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 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"
   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 not 'NF_DENSITY'"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-      tag: "NIC_Intel-X710"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-      tag: "NIC_Intel-XXV710"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-skx-cmp"
-      tag: "NIC_Intel-XXV710"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 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"
   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 not 'NF_DENSITY'"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-3n-skx-h1"
-      tag: "NIC_Intel-X710"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-skx-ref"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-      tag: "NIC_Intel-XXV710"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-skx-cmp"
-      tag: "NIC_Intel-XXV710"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
       compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
-# VPP Root Cause Analysis 2n-skx-xxv710 2t1c pdr
+# VPP Performance Changes 2n-skx 2t1c pdr
 - type: "table"
-  title: "VPP Root Cause Analysis 2n-skx-xxv710 2t1c pdr"
+  title: "VPP Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-rca-2n-skx-2t1c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  rca:
-    - title: "RCA1"
-      data: "rca/rca-2n-skx-2t1c-pdr-rca1.yaml"
-    - title: "RCA2"
-      data: "rca/rca-2n-skx-2t1c-pdr-rca2.yaml"
   columns:
-    - title: "1908.0-1"
-      data-set: "vpp-perf-changes-2n-skx-old1908_0"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    - title: "1908.1-1"
-      data-set: "vpp-perf-changes-2n-skx-old1908_1"
     - title: "1908.1-2"
-      data-set: "vpp-perf-changes-2n-skx-new1908_1"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2001.0-2"
-      data-set: "vpp-perf-changes-2n-skx-new2001_0"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
     - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
       reference: 2
-      reference-alt: 1
+      compare: 4
+#  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"
+  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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 2n-skx 4t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-skx 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-2n-skx-h1"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 4
       compare: 3
     - title: "Diff2"
-      reference: 3
+      reference: 2
       compare: 4
+#  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"
   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, "1" for 2019-08-21, "2" for 2020-03-27).'
-    - 'Diff1 - difference between environment versions "2" and "1" for the same VPP version, 1908.1-2 vs. 1908.1-1 (if data for the latter not present, 1908.0-1 is used).'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2001.0-2 vs. 1908.1-2.'
-    - 'RCA1 - root cause analysis reference for Diff1.'
-    - 'RCA2 - root cause analysis reference for Diff2.'
-
-# VPP Root Cause Analysis 2n-skx-xxv710 2t1c ndr
+    - "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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 2n-skx 2t1c ndr
 - type: "table"
-  title: "VPP Root Cause Analysis 2n-skx-xxv710 2t1c ndr"
+  title: "VPP Performance Changes 2n-skx 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-rca-2n-skx-2t1c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
-  rca:
-    - title: "RCA1"
-      data: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
-    - title: "RCA2"
-      data: "rca/rca-2n-skx-2t1c-ndr-rca2.yaml"
   columns:
-    - title: "1908.0-1"
-      data-set: "vpp-perf-changes-2n-skx-old1908_0"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    - title: "1908.1-1"
-      data-set: "vpp-perf-changes-2n-skx-old1908_1"
     - title: "1908.1-2"
-      data-set: "vpp-perf-changes-2n-skx-new1908_1"
+      data-set: "vpp-performance-changes-2n-skx-h1"
     - title: "2001.0-2"
-      data-set: "vpp-perf-changes-2n-skx-new2001_0"
+      data-set: "vpp-performance-changes-2n-skx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
     - title: "Diff1"
-      reference: 2
-      reference-alt: 1
+      reference: 4
       compare: 3
     - title: "Diff2"
-      reference: 3
+      reference: 2
       compare: 4
+#  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"
   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, "1" for 2019-08-21, "2" for 2020-03-27).'
-    - 'Diff1 - difference between environment versions "2" and "1" for the same VPP version, 1908.1-2 vs. 1908.1-1 (if data for the latter not present, 1908.0-1 is used).'
-    - 'Diff2 - difference between the current and the previous VPP version in the current environment version "2", 2001.0-2 vs. 1908.1-2.'
-    - 'RCA1 - root cause analysis reference for Diff1.'
-    - 'RCA2 - root cause analysis reference for Diff2.'
+    - "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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
-# VPP Performance Changes 2n-skx 2t1c pdr
+# VPP Performance Changes 2n-skx 4t2c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c pdr"
+  title: "VPP Performance Changes 2n-skx 4t2c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
+    - title: "1908.1-2"
       data-set: "vpp-performance-changes-2n-skx-h1"
-      tag: "NIC_Intel-X710"
-    - title: "1908"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-2n-skx-ref"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-      tag: "NIC_Intel-XXV710"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-2n-skx-cmp"
-      tag: "NIC_Intel-XXV710"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-skx-cmp-2"
   comparisons:
-    - title: "Diff"
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
       reference: 2
+      compare: 4
+#  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"
+  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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
+
+# VPP Performance Changes 2n-clx-xxv710 2t1c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-xxv710 2t1c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
+  comparisons:
+    - title: "Diff1"
+      reference: 3
+      compare: 2
+    - title: "Diff2"
+      reference: 1
       compare: 3
+#  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"
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
-# VPP Performance Changes 2n-skx 4t2c pdr
+# VPP Performance Changes 2n-clx-xxv710 4t2c pdr
 - type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c pdr"
+  title: "VPP Performance Changes 2n-clx-xxv710 4t2c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-pdr"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-      tag: "NIC_Intel-X710"
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-      tag: "NIC_Intel-XXV710"
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-      tag: "NIC_Intel-XXV710"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 3
+      compare: 2
+    - title: "Diff2"
+      reference: 1
       compare: 3
+#  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"
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
-# VPP Performance Changes 2n-skx 2t1c ndr
+# VPP Performance Changes 2n-clx-xxv710 2t1c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c ndr"
+  title: "VPP Performance Changes 2n-clx-xxv710 2t1c ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-      tag: "NIC_Intel-X710"
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-      tag: "NIC_Intel-XXV710"
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-      tag: "NIC_Intel-XXV710"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 3
+      compare: 2
+    - title: "Diff2"
+      reference: 1
       compare: 3
+#  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"
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
-# VPP Performance Changes 2n-skx 4t2c ndr
+# VPP Performance Changes 2n-clx-xxv710 4t2c ndr
 - type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c ndr"
+  title: "VPP Performance Changes 2n-clx-xxv710 ndr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-ndr"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
-      data-set: "vpp-performance-changes-2n-skx-h1"
-      tag: "NIC_Intel-X710"
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-ref"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-      tag: "NIC_Intel-XXV710"
-    - title: "2001"
-      data-set: "vpp-performance-changes-2n-skx-cmp"
-      tag: "NIC_Intel-XXV710"
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "2005.0-3"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 3
+      compare: 2
+    - title: "Diff2"
+      reference: 1
       compare: 3
+#  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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 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-4"
+      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-4"
+      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-4"
+      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-4"
+      data-set: "vpp-performance-changes-2n-clx-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001.0-2 and 2005.0-3 VPP version."
 
 # VPP Performance Changes 2n-dnv 1t1c pdr
 - type: "table"
   filter: "'1T1C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 2n-dnv 2t2c pdr
 - type: "table"
   filter: "'2T2C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 2n-dnv 1t1c ndr
 - type: "table"
   filter: "'1T1C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 2n-dnv 2t2c ndr
 - type: "table"
   filter: "'2T2C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-ref"
+      data-set: "vpp-performance-changes-2n-dnv-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-2n-dnv-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-2n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-dnv 1t1c pdr
 - type: "table"
   filter: "'1T1C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-dnv 2t2c pdr
 - type: "table"
   filter: "'2T2C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-dnv 1t1c ndr
 - type: "table"
   filter: "'1T1C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-dnv 2t2c ndr
 - type: "table"
   filter: "'2T2C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-dnv-ref"
+      data-set: "vpp-performance-changes-3n-dnv-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-dnv-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-dnv-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-tsh 1t1c pdr
 - type: "table"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 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"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 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"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 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"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C'"
   columns:
-    - title: "1908"
+    - title: "1908.1-2"
+      data-set: "vpp-performance-changes-3n-tsh-h1"
+    - title: "2001.0-2"
       data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2001"
+    - title: "2005.0-3"
       data-set: "vpp-performance-changes-3n-tsh-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-tsh-cmp-2"
   comparisons:
-    - title: "Diff"
-      reference: 1
-      compare: 2
+    - title: "Diff1"
+      reference: 4
+      compare: 3
+    - title: "Diff2"
+      reference: 2
+      compare: 4
+#  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"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - '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-06-11, "4" for 2020-06-24).'
+    - 'Diff1 - difference between environment versions "3" and "4" for the same VPP version, 2005.0-3 relative to 2005.0-4. Version "3" was found to be incompatible with "2" due to different number of TRex workers used.'
+    - 'Diff2 - difference between the current and the previous VPP version in the compatible environment versions "2" and "4", 2005.0-4 relative to 2001.0-2.'
+#    - 'RCA1 - root cause analysis reference for Diff1.'
+#    - 'RCA2 - root cause analysis reference for Diff2.'
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 - type: "table"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'MRR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
   columns:
-    - title: "1904"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # 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: "1904"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # 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: "1904"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-hsw-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-hsw-mrr-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # 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: "1904"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "1908"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+#    - title: "1908"
+#      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 2
-      compare: 3
+      reference: 1
+      compare: 2
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # 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: "1904"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "1908"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+#    - title: "1908"
+#      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 2
-      compare: 3
+      reference: 1
+      compare: 2
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # 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: "1904"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
-    - title: "1908"
-      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+#    - title: "1908"
+#      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-skx-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-skx-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 2
-      compare: 3
+      reference: 1
+      compare: 2
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # 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: "1904"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+#    - title: "1908"
+#      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 2
-      compare: 3
+      reference: 1
+      compare: 2
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # 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: "1904"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+#    - title: "1908"
+#      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 2
-      compare: 3
+      reference: 1
+      compare: 2
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # 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: "1904"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+#    - title: "1908"
+#      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-2n-skx-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-2n-skx-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 2
-      compare: 3
+      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-clx-xxv710 2t1c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-xxv710 2t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-mrr"
+  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"
+      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-clx-xxv710 4t2c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-xxv710 4t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-mrr"
+  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"
+      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-clx-xxv710 8t4c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-xxv710 8t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-8t4c-mrr"
+  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"
+      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-clx-clx-x556 2t1c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-clx-x556 2t1c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-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"
+    - 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-clx-clx-x556 4t2c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-clx-x556 4t2c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-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"
+    - 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-clx-clx-x556 8t4c mrr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-clx-x556 8t4c mrr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-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"
+    - title: "2005"
+      data-set: "vpp-performance-changes-2n-clx-mrr-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 2n-dnv 1t1c mrr
 - type: "table"
   filter: "'1T1C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      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: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 2n-dnv 2t2c mrr
 - type: "table"
   filter: "'2T2C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      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: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 2n-dnv 4t4c mrr
 - type: "table"
   filter: "'4T4C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-2n-dnv-mrr-ref"
+      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: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-dnv 1t1c mrr
 - type: "table"
   filter: "'1T1C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-dnv 2t2c mrr
 - type: "table"
   filter: "'2T2C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-dnv 4t4c mrr
 - type: "table"
   filter: "'4T4C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-dnv-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-dnv-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-tsh 1t1c mrr
 - type: "table"
   filter: "'1T1C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-tsh 2t2c mrr
 - type: "table"
   filter: "'2T2C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Performance Changes 3n-tsh 4t4c mrr
 - type: "table"
   filter: "'4T4C'"
   columns:
     - title: "1908"
-      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-h1"
     - title: "2001"
+      data-set: "vpp-performance-changes-3n-tsh-mrr-ref"
+    - title: "2005"
       data-set: "vpp-performance-changes-3n-tsh-mrr-cmp"
   comparisons:
     - title: "Diff"
-      reference: 1
-      compare: 2
+      reference: 2
+      compare: 3
   legend:
     - "Legend to Table"
-    - "1908, 2001 - VPP versions tested."
-    - "Diff - difference between 1908 and 2001 VPP version."
+    - "1908, 2001, 2005 - VPP versions tested."
+    - "Diff - difference between 2001 and 2005 VPP version."
 
 # VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
 - type: "table"
       data: "data msg"
   data: "vpp-perf-results-3n-skx"
   filter: "all"
-  remove-ndr: True  # Temporary solution: remove NDR results from test message
+  remove-ndr: False
   parameters:
   - "name"
   - "parent"
       data: "data msg"
   data: "vpp-perf-results-2n-skx"
   filter: "all"
-  remove-ndr: True  # Temporary solution: remove NDR results from test message
+  remove-ndr: False
   parameters:
   - "name"
   - "parent"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710'"
   columns:
-    - title: "1904"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-3n-hsw-ref"
+      data-set: "dpdk-performance-changes-3n-hsw-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-3n-hsw-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-3n-hsw-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-3n-skx-ref"
+      data-set: "dpdk-performance-changes-3n-skx-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-3n-skx-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-3n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 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: "1904"
-      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "1908"
-      data-set: "dpdk-performance-changes-2n-skx-ref"
+      data-set: "dpdk-performance-changes-2n-skx-h1"
     - title: "2001"
+      data-set: "dpdk-performance-changes-2n-skx-ref"
+    - title: "2005"
       data-set: "dpdk-performance-changes-2n-skx-cmp"
   comparisons:
     - title: "Diff"
       compare: 3
   legend:
     - "Legend to Table"
-    - "1904, 1908, 2001 - DPDK versions tested."
-    - "Diff - difference between 1908 and 2001 DPDK version."
+    - "1908, 2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+# DPDK Performance Changes 2n-clx 2t1c pdr
 - type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
+  title: "DPDK Performance Changes 2n-clx 2t1c pdr"
   algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710'"
-  columns:
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2001"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-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-clx 4t2c pdr
+- type: "table"
+  title: "DPDK Performance Changes 2n-clx 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2001"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-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-clx 2t1c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-clx 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2001"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-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-clx 4t2c ndr
+- type: "table"
+  title: "DPDK Performance Changes 2n-clx 4t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
+  columns:
+    - title: "2001"
+      data-set: "dpdk-performance-changes-2n-clx-ref"
+    - title: "2005"
+      data-set: "dpdk-performance-changes-2n-clx-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 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-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 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-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 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
+  legend:
+    - "Legend to Table"
+    - "2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
+
+# DPDK Performance Changes 3n-tsh 1t1c ndr
+- type: "table"
+  title: "DPDK Performance Changes 3n-tsh 1t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-1t1c-ndr"
+  include-tests: "NDR" # "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 ndr
+- type: "table"
+  title: "DPDK Performance Changes 3n-tsh 2t2c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-tsh-2t2c-ndr"
+  include-tests: "NDR" # "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
+  legend:
+    - "Legend to Table"
+    - "2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
+
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710'"
+  columns:
     - title: "3n-hsw x710"
       data-set: "dpdk-compare-testbeds-ref"
     - title: "3n-skx x710"
       data: "data msg"
   data: "dpdk-perf-results-3n-skx"
   filter: "all"
-  remove-ndr: True  # Temporary solution: remove NDR results from test message
+  remove-ndr: False
   parameters:
   - "name"
   - "parent"
       data: "data msg"
   data: "dpdk-perf-results-2n-skx"
   filter: "all"
-  remove-ndr: True  # Temporary solution: remove NDR results from test message
+  remove-ndr: False
   parameters:
   - "name"
   - "parent"
     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"
+## 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"
 
 ################################################################################
 
 # Reconf tests 2n-skx
 
 - type: "plot"
-  title: "NFV Implied time lost: 2n-skx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
+  title: "NFV Effective Blocked Time: 2n-skx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
   algorithm: "plot_nf_reconf_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-reconf"
   data: "plot-vpp-nfv-reconf-2n-skx"
   include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-2t1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-2t1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-2t1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-2t1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-2t1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-2t1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-2t1c-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-2t1c-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-2t1c-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-2t1c-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-2t1c-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-2t1c-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
   layout:
     title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "NFV Implied time lost: 2n-skx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
+  title: "NFV Effective Blocked Time: 2n-skx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
   algorithm: "plot_nf_reconf_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-reconf"
   data: "plot-vpp-nfv-reconf-2n-skx"
   include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-4t2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-4t2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-4t2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-4t2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-4t2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-4t2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-4t2c-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-4t2c-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-4t2c-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-4t2c-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-4t2c-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-4t2c-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
   layout:
     title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "NFV Implied time lost: 2n-skx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
+  title: "NFV Effective Blocked Time: 2n-skx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
   algorithm: "plot_nf_reconf_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-skx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-reconf"
   data: "plot-vpp-nfv-reconf-2n-skx"
   include:
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-8t4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-8t4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-8t4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-8t4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-8t4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
-    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-8t4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-1Ch-1Ach-2Vh-1Vm1T-Testpmd-Reconf.IMIX-8t4c-avf-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-2Ch-1Ach-4Vh-2Vm1T-Testpmd-Reconf.IMIX-8t4c-avf-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-4Ch-1Ach-8Vh-4Vm1T-Testpmd-Reconf.IMIX-8t4c-avf-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-6Ch-1Ach-12Vh-6Vm1T-Testpmd-Reconf.IMIX-8t4c-avf-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-8Ch-1Ach-16Vh-8Vm1T-Testpmd-Reconf.IMIX-8t4c-avf-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf"
+    - "Tests.Vpp.Perf.Nfv Density.Vm Vhost.Chain Dot1Qip4Vxlan.2N-25Ge2P1Xxv710-Avf-Dot1Qip4Vxlan-L2Bd-10Ch-1Ach-20Vh-10Vm1T-Testpmd-Reconf.IMIX-8t4c-avf-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf"
   layout:
     title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
     layout: "plot-throughput"
 # Reconf tests 2n-clx
 
 - type: "plot"
-  title: "NFV Implied time lost: 2n-clx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
+  title: "NFV Effective Blocked Time: 2n-clx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
   algorithm: "plot_nf_reconf_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-imix-2t1c-dot1qip4vxlan-l2bd-reconf"
   data: "plot-vpp-nfv-reconf-2n-clx"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "NFV Implied time lost: 2n-clx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
+  title: "NFV Effective Blocked Time: 2n-clx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
   algorithm: "plot_nf_reconf_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-imix-4t2c-dot1qip4vxlan-l2bd-reconf"
   data: "plot-vpp-nfv-reconf-2n-clx"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "NFV Implied time lost: 2n-clx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
+  title: "NFV Effective Blocked Time: 2n-clx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-reconf"
   algorithm: "plot_nf_reconf_box_name"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-imix-8t4c-dot1qip4vxlan-l2bd-reconf"
   data: "plot-vpp-nfv-reconf-2n-clx"
     title: "dot1qip4vxlan-l2bd-{Y}ch-1ach-{2XY}vh-{XY}vm-testpmd"
     layout: "plot-throughput"
 
-################################################################################
-## Plots - NF Density - VSC - MRR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - NDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - NDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - PDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - PDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           not 'VXLAN' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-################################################################################
-## Plots - NF Density - VSC - MRR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - NDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - NDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - PDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-vsc-vxlan-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-vsc-vxlan-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-vsc-vxlan-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           '118' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - VSC - PDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'VHOST' and
-#           'VXLAN' and
-#           'CHAIN' and
-#           'IMIX' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-################################################################################
-## Plots - NF Density - CSC - MRR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - NDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' 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: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' 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: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' 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: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - NDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' 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-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' 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-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' 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-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - PDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' 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: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' 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: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           '64B' 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: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSC - PDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' 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-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' 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-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' 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-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-################################################################################
-#
-## Plots - NF Density - CSC IPSEC 4tnl - MRR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-mrr"
-#  data: "plot-vpp-nfv-3n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-mrr"
-#  data: "plot-vpp-nfv-3n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_4' and
-#           'IMIX' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-mrr"
-#  data: "plot-vpp-nfv-3n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_4' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
-#    layout: "plot-service-density"
+###############################################################################
+
+# Plots - NF Density - VSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           not 'VXLAN' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vppip4-pdr"
+    layout: "plot-service-density"
+
+###############################################################################
+
+# Plots - NF Density - VSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - VSC - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-ndr"
+    layout: "plot-service-density"
 
-# Plots - NF Density - CSC IPSEC 4tnl - NDR IMIX
+# Plots - NF Density - VSC - PDR IMIX
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
   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"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-vsc-vxlan-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
   filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
-           'DOCKER' and
+           'VHOST' and
+           'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
   - "throughput"
   - "name"
   - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-vsc-vxlan-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}vh-{XY}vm-vxlan-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-vsc-vxlan-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'VHOST' and
+           'VXLAN' and
+           'CHAIN' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs 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}vh-{XY}vm-vxlan-vppip4-pdr"
+    layout: "plot-service-density"
+
+###############################################################################
+
+# Plots - NF Density - CSC - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "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]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
   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"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   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'"
+           'MRR'"
   parameters:
-  - "throughput"
+  - "result"
   - "name"
   - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  include-tests: "MRR" # "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]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
   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"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   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'"
+           'MRR'"
   parameters:
-  - "throughput"
+  - "result"
   - "name"
   - "tags"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  include-tests: "MRR" # "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]"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-mrr"
     layout: "plot-service-density"
 
-# Plots - NF Density - CSC IPSEC 4tnl - PDR IMIX
+# Plots - NF Density - CSC - NDR IMIX
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
   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"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-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'"
   - "throughput"
   - "name"
   - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  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 PDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
   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"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-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'"
   - "throughput"
   - "name"
   - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  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 PDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
   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"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-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'"
   - "throughput"
   - "name"
   - "tags"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  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 PDR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-ndr"
     layout: "plot-service-density"
 
-###############################################################################
-
-# Plots - NF Density - CSC IPSEC 4tnl - MRR IMIX
+# Plots - NF Density - CSC - PDR IMIX
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-4tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
            'NF_VPPIP4' and
            'IMIX' and
-           'TNL_4' and
-           '1T1C' and
-           'MRR'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  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 MRR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-4tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
            'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
            'IMIX' and
-           '2T2C' and
-           'MRR'"
+           '4T2C' and
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  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 MRR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
 - type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
   algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-4tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
            'NF_DENSITY' and
            'DOCKER' and
            'CHAIN' and
            'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_4' and
            'IMIX' and
-           '4T4C' and
-           'MRR'"
+           '8T4C' and
+           'NDRPDR'"
   parameters:
-  - "result"
+  - "throughput"
   - "name"
   - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  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 MRR) [Mpps]"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-vppip4-pdr"
     layout: "plot-service-density"
 
+################################################################################
+#
+## Plots - NF Density - CSC IPSEC 4tnl - MRR IMIX
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-4tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-skx-mrr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '2T1C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-4tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-skx-mrr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '4T2C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-4tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-skx-mrr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '8T4C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    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-hsw-xl710-imix-1t1c-ipsec-4tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_4' and
            'IMIX' and
-           '1T1C' and
+           '2T1C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-2t2c-ipsec-4tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_4' and
            'IMIX' and
-           '2T2C' and
+           '4T2C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-4t4c-ipsec-4tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_4' and
            'IMIX' and
-           '4T4C' and
+           '8T4C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-1t1c-ipsec-4tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_4' and
            'IMIX' and
-           '1T1C' and
+           '2T1C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-2t2c-ipsec-4tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_4' and
            'IMIX' and
-           '2T2C' and
+           '4T2C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-4t4c-ipsec-4tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_4' and
            'IMIX' and
-           '4T4C' and
+           '8T4C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 
 ###############################################################################
 
-## Plots - NF Density - CSC IPSEC 1000tnl - MRR IMIX
+## Plots - NF Density - CSC IPSEC 4tnl - MRR IMIX
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-mrr"
-#  data: "plot-vpp-nfv-3n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-4tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IMIX' and
+#           'TNL_4' and
+#           '1T1C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-4tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
 #           'CHAIN' and
 #           'NF_VPPIP4' and
 #           'IPSEC' and
-#           'TNL_1000' and
+#           'TNL_4' and
 #           'IMIX' and
-#           '2T1C' and
+#           '2T2C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-4tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '4T4C' and
 #           'MRR'"
 #  parameters:
 #  - "result"
 #  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
 #  x-axis: "X = CNFs per Service Chain"
 #  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    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-hsw-xl710-imix-1t1c-ipsec-4tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '1T1C' 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-hsw-xl710-imix-2t2c-ipsec-4tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '2T2C' 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-hsw-xl710-imix-4t4c-ipsec-4tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '4T4C' 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-hsw-xl710-imix-1t1c-ipsec-4tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '1T1C' 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-hsw-xl710-imix-2t2c-ipsec-4tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '2T2C' 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-hsw-xl710-imix-4t4c-ipsec-4tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_4' and
+#           'IMIX' and
+#           '4T4C' 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-mrr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-4tnl-vppip4-pdr"
 #    layout: "plot-service-density"
-#
+
+###############################################################################
+
+## Plots - NF Density - CSC IPSEC 1000tnl - MRR IMIX
 #- type: "plot"
 #  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-mrr"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-2t1c-ipsec-1000tnl-csc-mrr"
 #  data: "plot-vpp-nfv-3n-skx-mrr"
 #  filter: "'NIC_Intel-XXV710' and
 #           'NF_DENSITY' and
 #           'IPSEC' and
 #           'TNL_1000' and
 #           'IMIX' and
-#           '4T2C' and
+#           '2T1C' and
 #           'MRR'"
 #  parameters:
 #  - "result"
 #- type: "plot"
 #  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-mrr"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-4t2c-ipsec-1000tnl-csc-mrr"
 #  data: "plot-vpp-nfv-3n-skx-mrr"
 #  filter: "'NIC_Intel-XXV710' and
 #           'NF_DENSITY' and
 #           'IPSEC' and
 #           'TNL_1000' and
 #           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    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 - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-1000tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           'TNL_1000' and
-           '1T1C' and
-           'MRR'"
-  parameters:
-  - "result"
-  - "name"
-  - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-1000tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_1000' and
-           'IMIX' and
-           '2T2C' and
-           'MRR'"
-  parameters:
-  - "result"
-  - "name"
-  - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-1000tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_1000' and
-           'IMIX' and
-           '4T4C' and
-           'MRR'"
-  parameters:
-  - "result"
-  - "name"
-  - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
-    layout: "plot-service-density"
+#           '4T2C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-1000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-skx-mrr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '8T4C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    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-hsw-xl710-imix-1t1c-ipsec-1000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_1000' and
            'IMIX' and
-           '1T1C' and
+           '2T1C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-2t2c-ipsec-1000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_1000' and
            'IMIX' and
-           '2T2C' and
+           '4T2C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-4t4c-ipsec-1000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_1000' and
            'IMIX' and
-           '4T4C' and
+           '8T4C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-1t1c-ipsec-1000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_1000' and
            'IMIX' and
-           '1T1C' and
+           '2T1C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-2t2c-ipsec-1000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_1000' and
            'IMIX' and
-           '2T2C' and
+           '4T2C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-4t4c-ipsec-1000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_1000' and
            'IMIX' and
-           '4T4C' and
+           '8T4C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 
 ###############################################################################
 
+## Plots - NF Density - CSC IPSEC 1000tnl - MRR IMIX
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-1000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IMIX' and
+#           'TNL_1000' and
+#           '1T1C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-1000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '2T2C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
+#    layout: "plot-service-density"
+#
+#- type: "plot"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-1000tnl-vppip4-mrr"
+#  algorithm: "plot_nf_heatmap"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-1000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '4T4C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    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-hsw-xl710-imix-1t1c-ipsec-1000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '1T1C' 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-hsw-xl710-imix-2t2c-ipsec-1000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '2T2C' 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-hsw-xl710-imix-4t4c-ipsec-1000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '4T4C' 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-hsw-xl710-imix-1t1c-ipsec-1000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '1T1C' 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-hsw-xl710-imix-2t2c-ipsec-1000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '2T2C' 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-hsw-xl710-imix-4t4c-ipsec-1000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_1000' and
+#           'IMIX' and
+#           '4T4C' 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 10000tnl - MRR IMIX
 #- type: "plot"
 #  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #- type: "plot"
 #  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-mrr"
-#  data: "plot-vpp-nfv-3n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'CHAIN' and
-#           'NF_VPPIP4' and
-#           'IPSEC' and
-#           'TNL_10000' and
-#           'IMIX' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Chain"
-#  y-axis: "Y = Number of Service Chains"
-#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    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 - MRR IMIX
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IMIX' and
-           'TNL_10000' and
-           '1T1C' and
-           'MRR'"
-  parameters:
-  - "result"
-  - "name"
-  - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_10000' and
-           'IMIX' and
-           '2T2C' and
-           'MRR'"
-  parameters:
-  - "result"
-  - "name"
-  - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-    layout: "plot-service-density"
-
-- type: "plot"
-  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-  algorithm: "plot_nf_heatmap"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-mrr"
-  data: "plot-vpp-nfv-3n-hsw-mrr"
-  filter: "'NIC_Intel-XL710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'NF_VPPIP4' and
-           'IPSEC' and
-           'TNL_10000' and
-           'IMIX' and
-           '4T4C' and
-           'MRR'"
-  parameters:
-  - "result"
-  - "name"
-  - "tags"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  x-axis: "X = CNFs per Service Chain"
-  y-axis: "Y = Number of Service Chains"
-  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
-  layout:
-    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
-    layout: "plot-service-density"
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-skx-xxv710-imix-8t4c-ipsec-10000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-skx-mrr"
+#  filter: "'NIC_Intel-XXV710' and
+#           'NF_DENSITY' and
+#           'DOCKER' and
+#           'CHAIN' and
+#           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
+#           'IMIX' and
+#           '8T4C' and
+#           'MRR'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  - "tags"
+#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
+#  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+#  layout:
+#    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-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_10000' and
            'IMIX' and
-           '1T1C' and
+           '2T1C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_10000' and
            'IMIX' and
-           '2T2C' and
+           '4T2C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-ndr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_10000' and
            'IMIX' and
-           '4T4C' and
+           '8T4C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_10000' and
            'IMIX' and
-           '1T1C' and
+           '2T1C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_10000' and
            'IMIX' and
-           '2T2C' and
+           '4T2C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 - 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-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-pdr"
-  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
-  filter: "'NIC_Intel-XL710' and
+  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
            'IPSEC' and
            'TNL_10000' and
            'IMIX' and
-           '4T4C' and
+           '8T4C' and
            'NDRPDR'"
   parameters:
   - "throughput"
 
 ###############################################################################
 
-# Plots - NF Density - CSP - MRR 64b
-
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'MRR'"
-#  parameters:
-#  - "result"
-#  - "name"
-#  - "tags"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSP - MRR IMIX
+## Plots - NF Density - CSC IPSEC 10000tnl - MRR IMIX
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
 #           'IMIX' and
-#           '2T1C' and
+#           'TNL_10000' and
+#           '1T1C' and
 #           'MRR'"
 #  parameters:
 #  - "result"
 #  - "name"
 #  - "tags"
 #  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
 #  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
 #  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #    layout: "plot-service-density"
 #
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '4T2C' and
+#           '2T2C' and
 #           'MRR'"
 #  parameters:
 #  - "result"
 #  - "name"
 #  - "tags"
 #  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
 #  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
 #  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #    layout: "plot-service-density"
 #
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-mrr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr"
-#  data: "plot-vpp-nfv-2n-skx-mrr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-mrr"
+#  data: "plot-vpp-nfv-3n-hsw-mrr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '8T4C' and
+#           '4T4C' and
 #           'MRR'"
 #  parameters:
 #  - "result"
 #  - "name"
 #  - "tags"
 #  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  x-axis: "X = CNFs per Service Chain"
+#  y-axis: "Y = Number of Service Chains"
 #  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
 #  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSP - NDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSP - NDR IMIX
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           'IMIX' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#    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}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '4T2C' and
+#           '1T1C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  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}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#    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}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '8T4C' and
+#           '2T2C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  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}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
-#    layout: "plot-service-density"
-#
-## Plots - NF Density - CSP - PDR 64b
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-2t1c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '2T1C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-#    layout: "plot-service-density"
-#
-#- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
-#  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-4t2c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
-#           'NF_DENSITY' and
-#           'DOCKER' and
-#           'PIPELINE' and
-#           'NF_VPPIP4' and
-#           '64B' and
-#           '4T2C' and
-#           'NDRPDR'"
-#  parameters:
-#  - "throughput"
-#  - "name"
-#  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
-#  layout:
-#    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-64b-8t4c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-ndr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
-#           '64B' and
-#           '8T4C' and
+#           'IPSEC' and
+#           'TNL_10000' and
+#           'IMIX' and
+#           '4T4C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
-#  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
-#  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+#  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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-ndr"
 #    layout: "plot-service-density"
 #
-## Plots - NF Density - CSP - PDR IMIX
+## Plots - NF Density - CSC IPSEC 10000tnl - PDR IMIX
 #- type: "plot"
-#  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-1t1c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '2T1C' and
+#           '1T1C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-2t2c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '4T2C' and
+#           '2T2C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#  title: "Packet Throughput: eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #  algorithm: "plot_nf_heatmap"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr"
-#  data: "plot-vpp-nfv-2n-skx-ndrpdr"
-#  filter: "'NIC_Intel-XXV710' and
+#  output-file: "{DIR[STATIC,VPP]}/l2bd-3n-hsw-xl710-imix-4t4c-ipsec-10000tnl-csc-pdr"
+#  data: "plot-vpp-nfv-3n-hsw-ndrpdr"
+#  filter: "'NIC_Intel-XL710' and
 #           'NF_DENSITY' and
 #           'DOCKER' and
-#           'PIPELINE' and
+#           'CHAIN' and
 #           'NF_VPPIP4' and
+#           'IPSEC' and
+#           'TNL_10000' and
 #           'IMIX' and
-#           '8T4C' and
+#           '4T4C' and
 #           'NDRPDR'"
 #  parameters:
 #  - "throughput"
 #  - "name"
 #  - "tags"
 #  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-#  x-axis: "X = CNFs per Service Pipeline"
-#  y-axis: "Y = Number of Service Pipelines"
+#  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}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+#    title: "<b>Throughput:</b> eth-l2bd-{Y}ch-{2XY}mif-{XY}dcr-10000tnl-vppip4-pdr"
 #    layout: "plot-service-density"
 
+###############################################################################
+
+# Plots - NF Density - CSP - MRR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'MRR'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-mrr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - NDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-ndr"
+    layout: "plot-service-density"
+
+# Plots - NF Density - CSP - PDR IMIX
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
+- type: "plot"
+  title: "Packet Throughput: eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+  algorithm: "plot_nf_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-xxv710-imix-8t4c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx-ndrpdr"
+  filter: "'NIC_Intel-XXV710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'NF_VPPIP4' and
+           'IMIX' and
+           '8T4C' and
+           'NDRPDR'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{Y}pl-{2Y}mif-{XY}dcr-vppip4-pdr"
+    layout: "plot-service-density"
+
 ###############################################################################
 # Plots - 2n-clx NF Density - VSC - MRR IMIX
 
   output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-memif-base-avf-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   include:
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-eth-l2xcbase-avf-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-eth-l2xcbase-avf-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1dcr-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-eth-2memif-1lxc-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr"
-    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-avf-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
+    - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Lxc-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr"
     - "Tests.Vpp.Perf.Container Memif.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Memif-1Dcr-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-eth-2memif-1dcr-ndrpdr"
   layout:
     title: "3n-skx-xxv710-64b-2t1c-memif-base-avf-pdr"
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+#    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
 #    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
 #    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
   include:
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
-    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
+#    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
 #    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-ethip4-ip4base-ndrpdr"
 #    - "Tests.Vpp.Perf.Ip4.10Ge2P1X710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr"
   layout:
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr"
+  title: "Throughput: 3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   include:
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.64B-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.64B-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.64B-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr"
+    title: "3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr"
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 3n-skx-xxv710-64b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr"
+  title: "Throughput: 3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-64b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr"
+  output-file: "{DIR[STATIC,VPP]}/3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr"
   data: "plot-vpp-throughput-lat-tsa-3n-skx"
   include:
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.64B-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.64B-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.64B-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
-    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.64B-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec4Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-2t1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec1000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-2t1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.1518B-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr"
+    - "Tests.Vpp.Perf.Crypto.25Ge2P1Xxv710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.1518B-2t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr"
   layout:
-    title: "3n-skx-xxv710-64b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr"
+    title: "3n-skx-xxv710-1518b-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr"
     layout: "plot-throughput"
 
 - type: "plot"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
     title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-ndr"
     layout: "plot-throughput"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Ip6-Ip6Base-Srv6Enc1Sid-Ndrpdr.78B-2t1c-avf-ethip6ip6-ip6base-srv6enc1sid-ndrpdr"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr"
     - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Enc2Sids-Nodecaps-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
-    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Dyn-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Masq-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr"
+#    - "Tests.Vpp.Perf.Srv6.25Ge2P1Xxv710-Avf-Ethip6Srhip6-Ip6Base-Srv6Proxy-Stat-Ndrpdr.78B-2t1c-avf-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr"
   layout:
     title: "3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-avf-pdr"
     layout: "plot-throughput"
   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"
   output-file: "{DIR[STATIC,VPP]}/2n-clx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-pdr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Dot1Q-Ip4Base-Ndrpdr.64B-2t1c-avf-dot1q-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Base-Ndrpdr.64B-2t1c-avf-ethip4-ip4base-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr"
     - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X710-Avf-Ethip4-Ip4Scale2M-Rnd-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-rnd-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-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-ndr"
     layout: "plot-throughput"
     - "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-Ip4Scale1000-Udpsrcscale15-Nat44-Ndrpdr.64B-2t1c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr"
   layout:
     title: "2n-clx-cx556a-64b-2t1c-rdma-ethip4-features-pdr"
     layout: "plot-throughput"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-cx556a-64b-l2-vhost-vppl2xc-base-pdr-tsa"
+  title: "Speedup: 2n-clx-cx556a-64b-rdma-l2-vhost-vppl2xc-base-pdr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-l2-vhost-vppl2xc-base-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-cx556a-64b-rdma-l2-vhost-vppl2xc-base-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Xcbase-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
     - "Tests.Vpp.Perf.Vm Vhost.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-.t.c-rdma-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
   layout:
-    title: "2n-clx-cx556a-64b-l2-vhost-vppl2xc-base-pdr"
+    title: "2n-clx-cx556a-64b-rdma-l2-vhost-vppl2xc-base-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"