Report 2005: Add data

[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml

index 4db7db8..66f2035 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -145,299 +145,346 @@
  
    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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 21  # 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
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
  
      plot-vpp-hdrh-lat-3n-hsw:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 22  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        - 3   # NDRPDR sel
  
-    plot-vpp-nfv-3n-hsw-ndrpdr:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 21  # 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 103  # hoststack
+      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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-3n-hsw:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-        - 4   # NDRPDR sel
-        - 24  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-hsw:
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
  
      plot-dpdk-hdrh-lat-3n-hsw:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-3n-hsw:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-        - 16  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-hsw:
+        - 5   # NDRPDR sel
  
      # 3n-skx
  
      plot-vpp-throughput-lat-tsa-3n-skx:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
+        - 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
+      # 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-skx:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 50  # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-skx:
+        - 6   # MRR sel
  
      plot-dpdk-throughput-latency-3n-skx:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-3n-skx:
-      csit-dpdk-perf-verify-2001-3n-skx:
-        - 29  # NDRPDR sel xxv710
-        - 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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
+      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
+      csit-vpp-perf-report-iterative-2005-2n-skx:
+        - 55  # NDRPDR sel
  
      plot-vpp-soak-2n-skx:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # csit-vpp-perf-report-iterative-2005-2n-skx:
-      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:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 169  # 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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-2n-skx:
-      csit-dpdk-perf-verify-2001-2n-skx:
-        - 35  # NDRPDR sel xxv710
-        - 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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # 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
+        - 50  # NDRPDR sel
+        - 51  # NDRPDR sel
  
      plot-vpp-hdrh-lat-2n-clx:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 80  # TCP
+#    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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # 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
+        - 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 68  # 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
+        - 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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR 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
  
      plot-vpp-hdrh-lat-3n-tsh:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 10  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 9   # NDRPDR sel
  
      plot-dpdk-throughput-latency-3n-tsh:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-3n-tsh:
-      csit-dpdk-perf-verify-2001-3n-tsh:
-        - 3   # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-tsh:
+        - 5   # NDRPDR sel
  
      plot-dpdk-hdrh-lat-3n-tsh:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
  
      plot-dpdk-throughput-latency-3n-dnv:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
+        - 16  # NDRPDR sel
  
      # 2n-dnv
  
      plot-vpp-throughput-lat-tsa-2n-dnv:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-dnv:
-      csit-vpp-perf-verify-2001-2n-dnv:
-        - 4   # 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
+        - 14  # NDRPDR sel
  
      plot-dpdk-throughput-latency-2n-dnv:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
  
      ###########################################################################
      # Simple tables (only one data set):
@@ -445,170 +492,235 @@
      # NIC Comparisons
  
      vpp-nic-comparison-3n-skx:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
+        - 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
+      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-nic-comparison-2n-skx-mrr:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
  
      # Results
  
      vpp-perf-results-3n-hsw:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 21  # NDRPDR sel
+      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: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-skx:
-      csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR 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
  
      vpp-perf-results-2n-skx:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel
+      # 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
+      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 10  # NDRPDR sel
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 9   # NDRPDR sel
  
      vpp-perf-results-3n-dnv:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-dnv:
-      csit-vpp-perf-verify-2001-3n-dnv:
-        - 6   # NDRPDR sel
+      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-dnv:
-      csit-vpp-perf-verify-2001-2n-dnv:
-        - 4   # NDRPDR 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
  
      vpp-mrr-results-3n-hsw:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 9   # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 10  # MRR sel
  
      vpp-mrr-results-3n-dnv:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-    # TODO: Replace:
-    # csit-vpp-device-2005-ubuntu1804-1n-skx:
-      csit-vpp-device-2001-ubuntu1804-1n-skx:
-        - 57
+      csit-vpp-device-2005-ubuntu1804-1n-skx:
+        - 35
  
      dpdk-perf-results-3n-hsw:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-2n-dnv:
-      csit-dpdk-perf-verify-2001-2n-dnv:
-        - 16  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-2n-dnv:
+        - 8   # NDRPDR sel
  
      dpdk-perf-results-3n-dnv:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-3n-dnv:
-      csit-dpdk-perf-verify-2001-3n-dnv:
-        - 12  # NDRPDR sel
+      csit-dpdk-perf-report-iterative-2005-3n-dnv:
+        - 6   # NDRPDR sel
  
      dpdk-perf-results-3n-tsh:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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)
@@ -640,110 +752,126 @@
          - 32  # NDRPDR sel
          - 34  # NDRPDR sel
      vpp-performance-changes-3n-hsw-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
+        - 3   # NDRPDR sel
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-cmp-2:
+      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-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
+      csit-vpp-perf-verify-1908_1-3n-skx:
+        - 26  # NDRPDR sel - new1908.1
+        - 27  # NDRPDR sel - new1908.1
+        - 28  # NDRPDR sel - new1908.1
+        - 29  # NDRPDR sel - new1908.1
+        - 30  # NDRPDR sel - new1908.1
+        - 31  # NDRPDR sel - new1908.1
+        - 33  # NDRPDR sel - new1908.1
+        - 34  # NDRPDR sel - new1908.1
+        - 35  # NDRPDR sel - new1908.1
+        - 36  # NDRPDR sel - new1908.1
      vpp-performance-changes-3n-skx-ref:
        csit-vpp-perf-verify-2001-3n-skx:
-        - 69  # NDRPDR sel - new2001.0 - 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
-        - 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-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-1908-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
+      csit-vpp-perf-verify-1908_1-2n-skx:
+        - 39  # NDRPDR sel - new1908.1
+        - 40  # NDRPDR sel - new1908.1
+        - 41  # NDRPDR sel - new1908.1
+        - 43  # NDRPDR sel - new1908.1
+        - 44  # NDRPDR sel - new1908.1
+        - 45  # NDRPDR sel - new1908.1
+        - 46  # NDRPDR sel - new1908.1
+        - 47  # NDRPDR sel - new1908.1
+        - 48  # NDRPDR sel - new1908.1
+        - 49  # NDRPDR sel - new1908.1
      vpp-performance-changes-2n-skx-ref:
        csit-vpp-perf-verify-2001-2n-skx:
-        - 143  # NDRPDR sel - new2001.0 - 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
+        - 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
-
-    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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-skx:
-      csit-vpp-perf-verify-2001-2n-skx:
-        - 30  # NFV
-        - 31  # NFV
-
-    vpp-performance-changes-2n-clx-h1:
-      csit-vpp-perf-verify-1908_1-2n-clx:
-        - 5  # NDRPDR sel
-        - 6  # NDRPDR sel
-        - 7  # NDRPDR sel
-        - 8  # NDRPDR sel
-        - 9  # NDRPDR sel
+      csit-vpp-perf-report-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-clx-ref:
        csit-vpp-perf-verify-2001-2n-clx:
          - 28  # NDRPDR sel
@@ -757,19 +885,23 @@
          - 48  # NDRPDR sel
          - 49  # NDRPDR sel
      vpp-performance-changes-2n-clx-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
+    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:
@@ -796,19 +928,17 @@
          - 13  # NDRPDR sel
          - 16  # NDRPDR sel
      vpp-performance-changes-2n-dnv-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
  
      vpp-performance-changes-3n-dnv-h1:
        csit-vpp-perf-verify-1908-3n-dnv:
@@ -835,19 +965,17 @@
          - 17  # NDRPDR sel
          - 18  # NDRPDR sel
      vpp-performance-changes-3n-dnv-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
  
      vpp-performance-changes-3n-tsh-h1:
        csit-vpp-perf-verify-1908-3n-tsh:
@@ -874,93 +1002,80 @@
          - 15  # NDRPDR sel
          - 21  # NDRPDR sel
      vpp-performance-changes-3n-tsh-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
+    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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-soak-vs-ndr-2n-skx-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
      vpp-soak-vs-ndr-2n-skx:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
      vpp-soak-vs-ndr-2n-clx-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
      vpp-soak-vs-ndr-2n-clx:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-1908-3n-hsw:
@@ -969,44 +1084,42 @@
        csit-vpp-perf-verify-2001-3n-hsw:
          - 17  # MRR sel
      vpp-performance-changes-3n-hsw-mrr-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      csit-vpp-perf-verify-2001-3n-hsw:
-        - 17  # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-hsw:
+        - 13  # MRR
  
-    vpp-performance-changes-3n-skx-mrr-h1:
-      csit-vpp-perf-verify-1908-3n-skx:
-        - 36  # 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-2001-3n-skx:
          - 50  # MRR sel
          - 53  # MRR sel addition
      vpp-performance-changes-3n-skx-mrr-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-performance-changes-2n-skx-mrr-h1:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 69  # 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-2001-2n-skx:
          - 101 # MRR sel
          - 128 # MRR sel addition
      vpp-performance-changes-2n-skx-mrr-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-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:
-#      # TODO: Replace
  #      # csit-vpp-perf-verify-2001-2n-skx:
  #      csit-vpp-perf-verify-1908-2n-skx:
  #        - 71  # NFV MRR
@@ -1018,10 +1131,8 @@
        csit-vpp-perf-verify-2001-2n-dnv:
          - 12  # MRR sel
      vpp-performance-changes-2n-dnv-mrr-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-dnv:
-      csit-vpp-perf-verify-2001-2n-dnv:
-        - 12  # MRR sel
+      csit-vpp-perf-report-iterative-2005-2n-dnv:
+        - 15  # MRR sel
  
      vpp-performance-changes-3n-dnv-mrr-h1:
        csit-vpp-perf-verify-1908-3n-dnv:
@@ -1030,10 +1141,8 @@
        csit-vpp-perf-verify-2001-3n-dnv:
          - 11  # MRR sel
      vpp-performance-changes-3n-dnv-mrr-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-dnv:
-      csit-vpp-perf-verify-2001-3n-dnv:
-        - 11  # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-dnv:
+        - 8   # MRR
  
      vpp-performance-changes-3n-tsh-mrr-h1:
        csit-vpp-perf-verify-1908-3n-tsh:
@@ -1042,10 +1151,8 @@
        csit-vpp-perf-verify-2001-3n-tsh:
          - 9   # MRR sel
      vpp-performance-changes-3n-tsh-mrr-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-tsh:
-      csit-vpp-perf-verify-2001-3n-tsh:
-        - 9   # MRR sel
+      csit-vpp-perf-report-iterative-2005-3n-tsh:
+        - 10  # MRR sel
  
      dpdk-performance-changes-3n-hsw-h1:
        csit-dpdk-perf-verify-1908-3n-hsw:
@@ -1061,16 +1168,16 @@
          - 11  # NDRPDR sel
      dpdk-performance-changes-3n-hsw-ref:
        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
+        - 4   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
          - 15  # NDRPDR sel
          - 16  # NDRPDR sel
          - 17  # NDRPDR sel
@@ -1082,29 +1189,17 @@
          - 23  # NDRPDR sel
          - 24  # NDRPDR sel
      dpdk-performance-changes-3n-hsw-cmp:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-3n-hsw:
-      csit-dpdk-perf-verify-2001-3n-hsw:
-#        - 4   # NDRPDR sel
-#        - 5   # NDRPDR sel
-#        - 6   # NDRPDR sel
-#        - 7   # NDRPDR sel
-#        - 8   # NDRPDR sel
-#        - 9   # NDRPDR sel
-#        - 10  # NDRPDR sel
-#        - 11  # NDRPDR sel
-#        - 12  # NDRPDR sel
-#        - 13  # NDRPDR sel
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 17  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 21  # NDRPDR sel
-        - 22  # NDRPDR sel
-        - 23  # NDRPDR sel
-        - 24  # NDRPDR sel
+      csit-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-h1:
        csit-dpdk-perf-verify-1908-3n-skx:
@@ -1141,29 +1236,17 @@
          - 47  # NDRPDR sel x710
          - 48  # NDRPDR sel x710
      dpdk-performance-changes-3n-skx-cmp:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
  
      dpdk-performance-changes-2n-skx-h1:
        csit-dpdk-perf-verify-1908-2n-skx:
@@ -1200,156 +1283,219 @@
          - 51  # NDRPDR sel x710
          - 54  # NDRPDR sel x710
      dpdk-performance-changes-2n-skx-cmp:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
-
-    # Compare testbeds
+      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
  
-    vpp-compare-testbeds-ref:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      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
-    vpp-compare-testbeds-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
-        - 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-compare-testbeds-skx-clx-ref:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
-    vpp-compare-testbeds-skx-clx-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 32  # NDRPDR sel
-        - 40  # 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:
+      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-report-iterative-2005-2n-skx:
          - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 45  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 65  # NDRPDR sel
          - 47  # NDRPDR sel
-        - 48  # NDRPDR sel
-        - 49  # 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-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-compare-testbeds-hsw-clx-ref:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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:
+        - 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-hsw-clx-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
  
      vpp-compare-testbeds-mrr-ref:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-compare-testbeds-mrr-skx-clx-ref:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-compare-testbeds-mrr-skx-clx-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-3n-hsw:
-      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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-2n-clx:
-      csit-vpp-perf-verify-2001-2n-clx:
-        - 39  # MRR
+      csit-vpp-perf-report-iterative-2005-2n-clx:
+        - 12   # MRR
  
      dpdk-compare-testbeds-ref:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
@@ -1359,179 +1505,103 @@
          - 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:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
  
      dpdk-compare-testbeds-skx-clx-ref:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
      dpdk-compare-testbeds-skx-clx-cmp:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
  
      # Compare topologies
  
      vpp-compare-topologies-ref:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
-        - 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:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-compare-topologies-mrr-ref:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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-compare-topologies-mrr-cmp:
-      # TODO: Replace:
-      # csit-vpp-perf-report-iterative-2005-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
  
      dpdk-compare-topologies-ref:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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
      dpdk-compare-topologies-cmp:
-      # TODO: Replace:
-      # csit-dpdk-perf-verify-2005-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-layouts:
  
@@ -1621,120 +1691,6 @@
        hoverlabel:
          namelength: -1
  
-    plot-cps:
-      titlefont:
-        size: 18
-      xaxis:
-        title: "<b>Test Cases [Index]</b>"
-        titlefont:
-          size: 16
-        autorange: True
-        fixedrange: False
-        gridcolor: "rgb(230, 230, 230)"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickmode: "linear"
-        tickfont:
-          size: 16
-        zeroline: False
-      yaxis:
-        title: "<b>Connections Per Second [cps]</b>"
-        titlefont:
-          size: 16
-        gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        rangemode: "tozero"
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickformat: ".3s"
-        tickfont:
-          size: 16
-        zeroline: False
-      boxmode: "group"
-      boxgroupgap: 0.5
-      autosize: False
-      margin:
-        t: 50
-        b: 20
-        l: 80
-        r: 20
-      showlegend: True
-      legend:
-        orientation: "h"
-        font:
-          size: 16
-      width: 700
-      height: 800
-      paper_bgcolor: "#fff"
-      plot_bgcolor: "#fff"
-      hoverlabel:
-        namelength: -1
-
-    plot-rps:
-      titlefont:
-        size: 18
-      xaxis:
-        title: "<b>Test Cases [Index]</b>"
-        titlefont:
-          size: 16
-        autorange: True
-        fixedrange: False
-        gridcolor: "rgb(230, 230, 230)"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickmode: "linear"
-        tickfont:
-          size: 16
-        zeroline: False
-      yaxis:
-        title: "<b>Requests Per Second [rps]</b>"
-        titlefont:
-          size: 16
-        gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        rangemode: "tozero"
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(230, 230, 230)"
-        tickformat: ".3s"
-        tickfont:
-          size: 16
-        zeroline: False
-      boxmode: "group"
-      boxgroupgap: 0.5
-      autosize: False
-      margin:
-        t: 50
-        b: 20
-        l: 80
-        r: 20
-      showlegend: True
-      legend:
-        orientation: "h"
-        font:
-          size: 16
-      width: 700
-      height: 800
-      paper_bgcolor: "#fff"
-      plot_bgcolor: "#fff"
-      hoverlabel:
-        namelength: -1
-
      plot-hoststack:
        titlefont:
          size: 16
@@ -2196,16 +2152,6 @@
        - 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
@@ -2219,63 +2165,216 @@
        - 32  # NDRPDR sel
        - 34  # NDRPDR sel
        - 17  # MRR sel
-      - 103  # hoststack REMOVE
-    # TODO: Add data:
-    # csit-vpp-perf-report-iterative-2005-3n-hsw:
+    csit-vpp-perf-report-iterative-2005-3n-hsw:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 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:
-      - 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
+      - 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
+      - 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
-    # TODO: Add data:
-    # csit-vpp-perf-report-iterative-2005-3n-skx:
+    csit-vpp-perf-report-iterative-2005-3n-skx:
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel ??? all x710 failed
+      - 33  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 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-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
+      - 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
+      - 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 REMOVE
-      - 181  # Soak REMOVE
-      - 182  # Soak REMOVE
-    # TODO: Add data:
-    # csit-vpp-perf-report-iterative-2005-2n-skx:
+    csit-vpp-perf-report-iterative-2005-2n-skx:
+      - 43  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 65  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 55  # NDRPDR sel
+      - 67  # NDRPDR sel
+      - 75  # NDRPDR sel
+      - 76  # NDRPDR sel
+      - 73  # NDRPDR sel
+      - 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
@@ -2295,12 +2394,55 @@
        - 48  # NDRPDR sel
        - 49  # NDRPDR sel
        - 39  # MRR
-      - 68  # Reconf REMOVE
-      - 80  # TCP REMOVE
-      - 93  # Soak REMOVE
-      - 94  # Soak REMOVE
-    # TODO: Add data:
-    # csit-vpp-perf-report-iterative-2005-2n-clx:
+    csit-vpp-perf-report-iterative-2005-2n-clx:
+      - 7   # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 32  # NDRPDR sel ???
+      - 33  # NDRPDR sel ???
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 51  # NDRPDR sel
+      - 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
@@ -2327,7 +2469,15 @@
        - 21  # NDRPDR sel
        - 9   # MRR sel
      # TODO: Add data:
-    # csit-vpp-perf-report-iterative-2005-3n-tsh:
+    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
@@ -2353,8 +2503,28 @@
        - 17  # NDRPDR sel
        - 18  # NDRPDR sel
        - 11  # MRR sel
-    # TODO: Add data:
-    # csit-vpp-perf-report-iterative-2005-3n-dnv:
+    csit-vpp-perf-report-iterative-2005-3n-dnv:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 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
@@ -2380,8 +2550,25 @@
        - 13  # NDRPDR sel
        - 16  # NDRPDR sel
        - 12  # MRR sel
-    # TODO: Add data:
-    # csit-vpp-perf-report-iterative-2005-2n-dnv:
+    csit-vpp-perf-report-iterative-2005-2n-dnv:
+      - 3   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # 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
@@ -2415,8 +2602,17 @@
        - 22  # NDRPDR sel
        - 23  # NDRPDR sel
        - 24  # NDRPDR sel
-    # TODO: Add data:
-    # csit-dpdk-perf-verify-2005-3n-hsw:
+    csit-dpdk-perf-report-iterative-2005-3n-hsw:
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
  
      csit-dpdk-perf-verify-1908-3n-skx:
        - 3   # NDRPDR sel
@@ -2450,22 +2646,31 @@
        - 46  # NDRPDR sel x710
        - 47  # NDRPDR sel x710
        - 48  # NDRPDR sel x710
-    # TODO: Add data:
-    # csit-dpdk-perf-verify-2005-3n-skx:
-
-    csit-dpdk-perf-verify-1908-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
-    csit-dpdk-perf-verify-2001-2n-skx:
-      - 35  # NDRPDR sel xxv710
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+
+    csit-dpdk-perf-verify-1908-2n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+    csit-dpdk-perf-verify-2001-2n-skx:
+      - 35  # NDRPDR sel xxv710
        - 36  # NDRPDR sel xxv710
        - 37  # NDRPDR sel xxv710
        - 41  # NDRPDR sel xxv710
@@ -2485,8 +2690,17 @@
        - 50  # NDRPDR sel x710
        - 51  # NDRPDR sel x710
        - 54  # NDRPDR sel x710
-    # TODO: Add data:
-    # csit-dpdk-perf-verify-2005-2n-skx:
+    csit-dpdk-perf-report-iterative-2005-2n-skx:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
  
      csit-dpdk-perf-verify-2001-2n-clx:
        - 15  # NDRPDR sel
@@ -2509,8 +2723,17 @@
        - 32  # NDRPDR sel
        - 33  # NDRPDR sel
        - 34  # NDRPDR sel
-    # TODO: Add data:
-    # csit-dpdk-perf-verify-2005-2n-clx:
+    csit-dpdk-perf-report-iterative-2005-2n-clx:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
  
      csit-dpdk-perf-verify-2001-2n-dnv:
        - 9   # NDRPDR sel
@@ -2523,8 +2746,17 @@
        - 16  # NDRPDR sel
        - 17  # NDRPDR sel
        - 18  # NDRPDR sel
-    # TODO: Add data:
-    # csit-dpdk-perf-verify-2005-2n-dnv:
+    csit-dpdk-perf-report-iterative-2005-2n-dnv:
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
  
      csit-dpdk-perf-verify-2001-3n-dnv:
        - 12  # NDRPDR sel
@@ -2537,8 +2769,17 @@
        - 19  # NDRPDR sel
        - 20  # NDRPDR sel
        - 22  # NDRPDR sel
-    # TODO: Add data:
-    # csit-dpdk-perf-verify-2005-3n-dnv:
+    csit-dpdk-perf-report-iterative-2005-3n-dnv:
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 16  # NDRPDR sel
  
      csit-dpdk-perf-verify-2001-3n-tsh:
        - 3   # NDRPDR sel
@@ -2551,13 +2792,11 @@
        - 14  # NDRPDR sel
        - 15  # NDRPDR sel
        - 18  # NDRPDR sel
-    # TODO: Add data:
-    # csit-dpdk-perf-verify-2005-3n-tsh:
+    csit-dpdk-perf-report-iterative-2005-3n-tsh:
+      - 5   # NDRPDR sel
  
-    # TODO: Replace:
-    # csit-vpp-device-2005-ubuntu1804-1n-skx:
-    csit-vpp-device-2001-ubuntu1804-1n-skx:
-      - 57
+    csit-vpp-device-2005-ubuntu1804-1n-skx:
+      - 35
  
  - type: "output"
    output: "report"
@@ -2703,74 +2942,74 @@
      - "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"
@@ -2936,132 +3175,6 @@
  ################################################################################
  # 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"
@@ -3070,20 +3183,33 @@
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005"
+    - 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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2008 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"
@@ -3093,20 +3219,33 @@
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005"
+    - 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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2008 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"
@@ -3116,20 +3255,34 @@
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005"
+    - 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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2008 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"
@@ -3139,94 +3292,31 @@
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-3n-hsw-h1"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-hsw-ref"
-    - title: "2005"
+    - 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
-  legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2008 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"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 2
-#      reference-alt: 1
-#      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'"
+    - title: "Diff2"
+      reference: 2
+      compare: 4
  #  rca:
  #    - title: "RCA1"
-#      data: "rca/rca-3n-skx-2t1c-ndr-rca1.yaml"
+#      data: "rca/rca-2005-3n-hsw-2t2c-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
-#  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.'
+#      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, "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.'
  
@@ -3238,21 +3328,33 @@
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-3n-skx-h1"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
        data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
    comparisons:
-    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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"
@@ -3262,21 +3364,33 @@
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-3n-skx-h1"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
        data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
    comparisons:
-    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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"
@@ -3286,21 +3400,33 @@
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-3n-skx-h1"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
        data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
    comparisons:
-    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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"
@@ -3310,95 +3436,31 @@
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-3n-skx-h1"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-3n-skx-vhost"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-skx-ref"
-    - title: "2005"
+    - title: "2005.0-3"
        data-set: "vpp-performance-changes-3n-skx-cmp"
+    - title: "2005.0-4"
+      data-set: "vpp-performance-changes-3n-skx-cmp-2"
    comparisons:
-    - title: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
        compare: 3
-  legend:
-    - "Legend to Table"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 VPP version."
-
-## VPP Root Cause Analysis 2n-skx-xxv710 2t1c pdr
-#- type: "table"
-#  title: "VPP Root Cause Analysis 2n-skx-xxv710 2t1c pdr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-rca-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"
-#    - title: "2001.0-2"
-#      data-set: "vpp-perf-changes-2n-skx-new2001_0"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 2
-#      reference-alt: 1
-#      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 2n-skx-xxv710 2t1c ndr
-#- type: "table"
-#  title: "VPP Root Cause Analysis 2n-skx-xxv710 2t1c ndr"
-#  algorithm: "table_comparison"
-#  output-file: "{DIR[STATIC,VPP]}/performance-rca-2n-skx-2t1c-ndr"
-#  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-#  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+    - title: "Diff2"
+      reference: 2
+      compare: 4
  #  rca:
  #    - title: "RCA1"
-#      data: "rca/rca-2n-skx-2t1c-ndr-rca1.yaml"
+#      data: "rca/rca-2005-3n-skx-4t2c-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"
-#    - title: "2001.0-2"
-#      data-set: "vpp-perf-changes-2n-skx-new2001_0"
-#  comparisons:
-#    - title: "Diff1"
-#      reference: 2
-#      reference-alt: 1
-#      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.'
+#      data: "rca/rca-2005-3n-skx-4t2c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-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.'
  
@@ -3410,21 +3472,33 @@
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-2n-skx-h1"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005"
+    - 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: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
        compare: 3
+    - title: "Diff2"
+      reference: 2
+      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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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
  - type: "table"
@@ -3434,21 +3508,33 @@
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-2n-skx-h1"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005"
+    - 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: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
        compare: 3
+    - title: "Diff2"
+      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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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
  - type: "table"
@@ -3458,21 +3544,33 @@
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-2n-skx-h1"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005"
+    - 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: "Diff"
-      reference: 2
+    - title: "Diff1"
+      reference: 4
        compare: 3
+    - title: "Diff2"
+      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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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
  - type: "table"
@@ -3482,21 +3580,253 @@
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
+    - title: "1908.1-2"
        data-set: "vpp-performance-changes-2n-skx-h1"
-      data-replacement: "replacement-1908-vpp-throughput-lat-tsa-2n-skx-vhost"
-    - title: "2001"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-2n-skx-ref"
-    - title: "2005"
+    - 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: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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-clx-xxv710 4t2c pdr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-xxv710 4t2c pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "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-4t2c-pdr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-clx-4t2c-pdr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-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 ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-xxv710 2t1c ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "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-ndr-rca1.yaml"
+#    - title: "RCA2"
+#      data: "rca/rca-2005-2n-clx-2t1c-ndr-rca2.yaml"
+  legend:
+    - "Legend to Table"
+    - 'YYMM.V-E - tested VPP version (YY year, MM month, V minor version) and CSIT test environment version (E environment version, "2" for 2020-03-27, "3" for 2020-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 4t2c ndr
+- type: "table"
+  title: "VPP Performance Changes 2n-clx-xxv710 ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-clx-xxv710-4t2c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  columns:
+    - title: "2001.0-2"
+      data-set: "vpp-performance-changes-2n-clx-ref"
+    - title: "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-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"
+    - "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"
@@ -3690,20 +4020,33 @@
    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"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2005"
+    - 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: 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, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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"
@@ -3713,20 +4056,33 @@
    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"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2005"
+    - 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: 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, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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"
@@ -3736,20 +4092,33 @@
    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"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2005"
+    - 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: 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, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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"
@@ -3759,20 +4128,33 @@
    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"
+    - title: "2001.0-2"
        data-set: "vpp-performance-changes-3n-tsh-ref"
-    - title: "2005"
+    - 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: 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, 2005 - VPP versions tested."
-    - "Diff - difference between 2001 and 2005 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"
@@ -4203,19 +4585,19 @@
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
+#    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
+    - "2001, 2005 - VPP versions tested."
      - "Diff - difference between 2001 and 2005 VPP version."
  
  # VPP Performance Changes 3n-skx 4t2c mrr
@@ -4226,19 +4608,19 @@
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
+#    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
+    - "2001, 2005 - VPP versions tested."
      - "Diff - difference between 2001 and 2005 VPP version."
  
  # VPP Performance Changes 3n-skx 8t4c mrr
@@ -4249,19 +4631,19 @@
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
-      data-set: "vpp-performance-changes-3n-skx-mrr-h1"
+#    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
+    - "2001, 2005 - VPP versions tested."
      - "Diff - difference between 2001 and 2005 VPP version."
  
  # VPP Performance Changes 2n-skx 2t1c mrr
@@ -4272,19 +4654,19 @@
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'2T1C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
+#    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
+    - "2001, 2005 - VPP versions tested."
      - "Diff - difference between 2001 and 2005 VPP version."
  
  # VPP Performance Changes 2n-skx 4t2c mrr
@@ -4295,19 +4677,19 @@
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'4T2C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
+#    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
+    - "2001, 2005 - VPP versions tested."
      - "Diff - difference between 2001 and 2005 VPP version."
  
  # VPP Performance Changes 2n-skx 8t4c mrr
@@ -4318,19 +4700,145 @@
    include-tests: "MRR" # "PDR" | "NDR" | "MRR"
    filter: "'8T4C' and 'MRR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
    columns:
-    - title: "1908"
-      data-set: "vpp-performance-changes-2n-skx-mrr-h1"
+#    - title: "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"
-    - "1908, 2001, 2005 - VPP versions tested."
+    - "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"
+    - "2001, 2005 - VPP versions tested."
      - "Diff - difference between 2001 and 2005 VPP version."
  
  # VPP Performance Changes 2n-dnv 1t1c mrr
@@ -5651,774 +6159,1110 @@
      - "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'"
+  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: "3n-hsw x710"
-      data-set: "dpdk-compare-testbeds-ref"
-    - title: "3n-skx x710"
-      data-set: "dpdk-compare-testbeds-cmp"
+    - 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"
-    - "3n-hsw x710, 3n-skx x710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw x710 and 3n-skx x710 testbeds."
+    - "2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
  
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+# DPDK Performance Changes 2n-clx 4t2c pdr
  - type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  title: "DPDK Performance Changes 2n-clx 4t2c pdr"
    algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-4t2c-pdr"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710'"
+  filter: "'4T2C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
    columns:
-    - title: "3n-hsw x710"
-      data-set: "dpdk-compare-testbeds-ref"
-    - title: "3n-skx x710"
-      data-set: "dpdk-compare-testbeds-cmp"
+    - 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"
-    - "3n-hsw x710, 3n-skx x710 - testbeds and NICs tested."
-    - "Diff - difference between 3n-hsw x710 and 3n-skx x710 testbeds."
+    - "2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
  
-# DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr
+# DPDK Performance Changes 2n-clx 2t1c ndr
  - type: "table"
-  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr"
+  title: "DPDK Performance Changes 2n-clx 2t1c ndr"
    algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-ndr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-clx-2t1c-ndr"
    include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710'"
    columns:
-    - title: "2n-skx"
-      data-set: "dpdk-compare-testbeds-skx-clx-ref"
-    - title: "2n-clx"
-      data-set: "dpdk-compare-testbeds-skx-clx-cmp"
+    - 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"
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - "2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
  
-# DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr
+# DPDK Performance Changes 2n-clx 4t2c ndr
  - type: "table"
-  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr"
+  title: "DPDK Performance Changes 2n-clx 4t2c ndr"
    algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-pdr"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
+  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: "2n-skx"
-      data-set: "dpdk-compare-testbeds-skx-clx-ref"
-    - title: "2n-clx"
-      data-set: "dpdk-compare-testbeds-skx-clx-cmp"
+    - 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"
-    - "2n-skx, 2n-clx - testbeds and NICs tested."
-    - "Diff - difference between 2n-skx and 2n-clx testbeds."
+    - "2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
  
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
+# DPDK Performance Changes 2n-dnv 1t1c pdr
  - type: "table"
-  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
+  title: "DPDK Performance Changes 2n-dnv 1t1c pdr"
    algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
+  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: "3n-skx"
-      data-set: "dpdk-compare-topologies-ref"
-    - title: "2n-skx"
-      data-set: "dpdk-compare-topologies-cmp"
+    - 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"
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - "2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
  
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
+# DPDK Performance Changes 2n-dnv 2t2c pdr
  - type: "table"
-  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
+  title: "DPDK Performance Changes 2n-dnv 2t2c pdr"
    algorithm: "table_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-dnv-2t2c-pdr"
    include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-XXV710'"
+  filter: "'2T2C' and 'NDRPDR' and 'NIC_Intel-X553'"
    columns:
-    - title: "3n-skx"
-      data-set: "dpdk-compare-topologies-ref"
-    - title: "2n-skx"
-      data-set: "dpdk-compare-topologies-cmp"
+    - 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"
-    - "3n-skx, 2n-skx - topologies tested."
-    - "Diff - difference between 3n-skx and 2n-skx topologies."
+    - "2001, 2005 - DPDK versions tested."
+    - "Diff - difference between 2001 and 2005 DPDK version."
  
-# Detailed Test Results - DPDK Performance Results 3n-hsw
+# DPDK Performance Changes 2n-dnv 1t1c ndr
  - type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  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: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-perf-results-3n-hsw"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+    - 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."
  
-# Detailed Test Results - DPDK Performance Results 3n-skx
+# DPDK Performance Changes 2n-dnv 2t2c ndr
  - type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  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: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-perf-results-3n-skx"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+    - 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."
  
-# Detailed Test Results - DPDK Performance Results 2n-skx
+# DPDK Performance Changes 3n-dnv 1t1c pdr
  - type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+  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: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-perf-results-2n-skx"
-  filter: "all"
-  remove-ndr: False
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+    - 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."
  
-# Detailed Test Results - DPDK Performance Results 2n-clx
+# DPDK Performance Changes 3n-dnv 2t2c pdr
  - type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-clx"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
+  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: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-perf-results-2n-clx"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+    - 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."
  
-# Detailed Test Results - DPDK Performance Results 2n-dnv
+# DPDK Performance Changes 3n-dnv 1t1c ndr
  - type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
+  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: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-perf-results-2n-dnv"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+    - 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."
  
-# Detailed Test Results - DPDK Performance Results 3n-dnv
+# DPDK Performance Changes 3n-dnv 2t2c ndr
  - type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-dnv"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
+  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: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-perf-results-3n-dnv"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
+    - 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."
  
-# Detailed Test Results - DPDK Performance Results 3n-tsh
+# DPDK Performance Changes 3n-tsh 1t1c pdr
  - type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-tsh"
-  algorithm: "table_merged_details"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}/dpdk_performance_results_3n_tsh"
+  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: " |prein| Test Name |preout| "
-      data: "data name"
-    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
-      data: "data msg"
-  data: "dpdk-perf-results-3n-tsh"
-  filter: "all"
-  parameters:
-  - "name"
-  - "parent"
-  - "msg"
-
-################################################################################
-###                                F I L E S                                 ###
-################################################################################
+    - 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."
  
-# VPP Performance Results
-- type: "file"
-  title: "VPP Performance Results"
-  algorithm: "file_details_split"
-  output-file: "{DIR[DTR,PERF,VPP,ALL]}"
-  dir-tables:
-    - "{DIR[DTR,PERF,VPP,2N,SKX]}"
-    - "{DIR[DTR,PERF,VPP,3N,SKX]}"
-    - "{DIR[DTR,PERF,VPP,2N,CLX]}"
-    - "{DIR[DTR,PERF,VPP,3N,HSW]}"
-    - "{DIR[DTR,PERF,VPP,3N,TSH]}"
-    - "{DIR[DTR,PERF,VPP,2N,DNV]}"
-    - "{DIR[DTR,PERF,VPP,3N,DNV]}"
-  data:
-    - "vpp-perf-results-2n-skx"
-    - "vpp-perf-results-3n-skx"
-    - "vpp-perf-results-2n-clx"
-    - "vpp-perf-results-3n-hsw"
-    - "vpp-perf-results-3n-tsh"
-    - "vpp-perf-results-2n-dnv"
-    - "vpp-perf-results-3n-dnv"
-  filter: "all"
-  data-start-level: 4
-  order-chapters:
-    level-1:
-      - "l2"
-      - "ip4"
-      - "ip6"
-      - "srv6"
-      - "ip4_tunnels"
-      - "ip6_tunnels"
-      - "vm_vhost"
-      - "container_memif"
-      - "crypto"
-      - "vts"
-      - "lb"
-      - "nfv_density"
-      - "hoststack"
-    level-2:
-      - "2n-skx"
-      - "3n-skx"
-      - "2n-clx"
-      - "3n-hsw"
-      - "3n-tsh"
-      - "2n-dnv"
-      - "3n-dnv"
-    level-3:
-      - "xl710"
-      - "x520"
-      - "xxv710"
-      - "x710"
-      - "x553"
-      - "cx556a"
-      - "vic1227"
-      - "vic1385"
+# 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."
  
-# VPP Performance Configuration
-- type: "file"
-  title: "VPP Performance Configuration"
-  algorithm: "file_details_split"
-  output-file: "{DIR[DTC,PERF,VPP,ALL]}"
-  dir-tables:
-    - "{DIR[DTC,PERF,VPP,2N,SKX]}"
-    - "{DIR[DTC,PERF,VPP,3N,SKX]}"
-    - "{DIR[DTC,PERF,VPP,2N,CLX]}"
-    - "{DIR[DTC,PERF,VPP,3N,HSW]}"
-    - "{DIR[DTC,PERF,VPP,3N,TSH]}"
-    - "{DIR[DTC,PERF,VPP,2N,DNV]}"
-    - "{DIR[DTC,PERF,VPP,3N,DNV]}"
-  data:
-    - "vpp-perf-results-2n-skx"
-    - "vpp-perf-results-3n-skx"
-    - "vpp-perf-results-2n-clx"
-    - "vpp-perf-results-3n-hsw"
-    - "vpp-perf-results-3n-tsh"
-    - "vpp-perf-results-2n-dnv"
-    - "vpp-perf-results-3n-dnv"
-  filter: "all"
-  data-start-level: 4
-  order-chapters:
-    level-1:
-      - "l2"
-      - "ip4"
-      - "ip6"
-      - "srv6"
-      - "ip4_tunnels"
-      - "ip6_tunnels"
-      - "vm_vhost"
-      - "container_memif"
-      - "crypto"
-      - "vts"
-      - "lb"
-      - "nfv_density"
-      - "hoststack"
-    level-2:
-      - "2n-skx"
-      - "3n-skx"
-      - "2n-clx"
-      - "3n-hsw"
-      - "3n-tsh"
-      - "2n-dnv"
-      - "3n-dnv"
-    level-3:
-      - "xl710"
-      - "x520"
-      - "xxv710"
-      - "x710"
-      - "x553"
-      - "cx556a"
-      - "vic1227"
-      - "vic1385"
+# 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."
  
-# VPP Performance Operational
-- type: "file"
-  title: "VPP Performance Operational"
-  algorithm: "file_details_split_html"
-  output-file: "{DIR[DTO,PERF,VPP,ALL]}"
-  dir-tables:
-    - "{DIR[DTO,PERF,VPP,2N,SKX]}"
-    - "{DIR[DTO,PERF,VPP,3N,SKX]}"
-    - "{DIR[DTO,PERF,VPP,2N,CLX]}"
-    - "{DIR[DTO,PERF,VPP,3N,HSW]}"
-    - "{DIR[DTO,PERF,VPP,3N,TSH]}"
-    - "{DIR[DTO,PERF,VPP,2N,DNV]}"
-    - "{DIR[DTO,PERF,VPP,3N,DNV]}"
-  data:
-    - "vpp-perf-results-2n-skx"
-    - "vpp-perf-results-3n-skx"
-    - "vpp-perf-results-2n-clx"
-    - "vpp-perf-results-3n-hsw"
-    - "vpp-perf-results-3n-tsh"
-    - "vpp-perf-results-2n-dnv"
-    - "vpp-perf-results-3n-dnv"
-  filter: "all"
-  data-start-level: 4
-  order-chapters:
-    level-1:
-      - "l2"
-      - "ip4"
-      - "ip6"
-      - "srv6"
-      - "ip4_tunnels"
-      - "ip6_tunnels"
-      - "vm_vhost"
-      - "container_memif"
-      - "crypto"
-      - "vts"
-      - "lb"
-      - "nfv_density"
-      - "hoststack"
-    level-2:
-      - "2n-skx"
-      - "3n-skx"
-      - "2n-clx"
-      - "3n-hsw"
-      - "3n-tsh"
-      - "2n-dnv"
-      - "3n-dnv"
-    level-3:
-      - "xl710"
-      - "x520"
-      - "xxv710"
-      - "x710"
-      - "x553"
-      - "cx556a"
-      - "vic1227"
-      - "vic1385"
+# 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."
  
-# VPP MRR Results
-- type: "file"
-  title: "VPP MRR Results"
-  algorithm: "file_details_split"
-  output-file: "{DIR[DTR,MRR,VPP,ALL]}"
-  dir-tables:
-    - "{DIR[DTR,MRR,VPP,2N,SKX]}"
-    - "{DIR[DTR,MRR,VPP,3N,SKX]}"
-    - "{DIR[DTR,MRR,VPP,2N,CLX]}"
-    - "{DIR[DTR,MRR,VPP,3N,HSW]}"
-    - "{DIR[DTR,MRR,VPP,3N,TSH]}"
-    - "{DIR[DTR,MRR,VPP,2N,DNV]}"
-    - "{DIR[DTR,MRR,VPP,3N,DNV]}"
-  data:
-    - "vpp-mrr-results-2n-skx"
-    - "vpp-mrr-results-3n-skx"
-    - "vpp-mrr-results-2n-clx"
-    - "vpp-mrr-results-3n-hsw"
-    - "vpp-mrr-results-3n-tsh"
-    - "vpp-mrr-results-2n-dnv"
-    - "vpp-mrr-results-3n-dnv"
-  filter: "all"
-  data-start-level: 4
-  order-chapters:
-    level-1:
-      - "l2"
-      - "ip4"
-      - "ip6"
-      - "srv6"
-      - "ip4_tunnels"
-      - "ip6_tunnels"
-      - "vm_vhost"
-      - "container_memif"
-      - "crypto"
-      - "vts"
-      - "lb"
-      - "nfv_density"
-      - "hoststack"
-    level-2:
-      - "2n-skx"
-      - "3n-skx"
-      - "2n-clx"
-      - "3n-hsw"
-      - "3n-tsh"
-      - "2n-dnv"
-      - "3n-dnv"
-    level-3:
-      - "xl710"
-      - "x520"
-      - "xxv710"
-      - "x710"
-      - "x553"
-      - "cx556a"
-      - "vic1227"
-      - "vic1385"
+# 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-set: "dpdk-compare-testbeds-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - "Legend to Table"
+    - "3n-hsw x710, 3n-skx x710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-hsw x710 and 3n-skx x710 testbeds."
  
-# VPP MRR Configuration
-- type: "file"
-  title: "VPP MRR Configuration"
-  algorithm: "file_details_split"
-  output-file: "{DIR[DTC,MRR,VPP,ALL]}"
-  dir-tables:
-    - "{DIR[DTC,MRR,VPP,2N,SKX]}"
-    - "{DIR[DTC,MRR,VPP,3N,SKX]}"
-    - "{DIR[DTC,MRR,VPP,2N,CLX]}"
-    - "{DIR[DTC,MRR,VPP,3N,HSW]}"
-    - "{DIR[DTC,MRR,VPP,3N,TSH]}"
-    - "{DIR[DTC,MRR,VPP,2N,DNV]}"
-    - "{DIR[DTC,MRR,VPP,3N,DNV]}"
-  data:
-    - "vpp-mrr-results-2n-skx"
-    - "vpp-mrr-results-3n-skx"
-    - "vpp-mrr-results-2n-clx"
-    - "vpp-mrr-results-3n-hsw"
-    - "vpp-mrr-results-3n-tsh"
-    - "vpp-mrr-results-2n-dnv"
-    - "vpp-mrr-results-3n-dnv"
-  filter: "all"
-  data-start-level: 4
-  order-chapters:
-    level-1:
-      - "l2"
-      - "ip4"
-      - "ip6"
-      - "srv6"
-      - "ip4_tunnels"
-      - "ip6_tunnels"
-      - "vm_vhost"
-      - "container_memif"
-      - "crypto"
-      - "vts"
-      - "lb"
-      - "nfv_density"
-      - "hoststack"
-    level-2:
-      - "2n-skx"
-      - "3n-skx"
-      - "2n-clx"
-      - "3n-hsw"
-      - "3n-tsh"
-      - "2n-dnv"
-      - "3n-dnv"
-    level-3:
-      - "xl710"
-      - "x520"
-      - "xxv710"
-      - "x710"
-      - "x553"
-      - "cx556a"
-      - "vic1227"
-      - "vic1385"
+# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710'"
+  columns:
+    - title: "3n-hsw x710"
+      data-set: "dpdk-compare-testbeds-ref"
+    - title: "3n-skx x710"
+      data-set: "dpdk-compare-testbeds-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - "Legend to Table"
+    - "3n-hsw x710, 3n-skx x710 - testbeds and NICs tested."
+    - "Diff - difference between 3n-hsw x710 and 3n-skx x710 testbeds."
  
-# VPP Device Results - Ubuntu
-- type: "file"
-  title: "VPP Device Results - Ubuntu"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
-  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
-  data-start-level: 4
+# DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx"
+      data-set: "dpdk-compare-testbeds-skx-clx-ref"
+    - title: "2n-clx"
+      data-set: "dpdk-compare-testbeds-skx-clx-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - "Legend to Table"
+    - "2n-skx, 2n-clx - testbeds and NICs tested."
+    - "Diff - difference between 2n-skx and 2n-clx testbeds."
  
-# VPP Device Configuration - Ubuntu
-- type: "file"
-  title: "VPP Device Configuration - Ubuntu"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
-  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
-  data-start-level: 4
+# DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr
+- type: "table"
+  title: "DPDK Comparison Across Testbeds 2n-skx to 2n-clx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-2n-skx-2n-clx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "2n-skx"
+      data-set: "dpdk-compare-testbeds-skx-clx-ref"
+    - title: "2n-clx"
+      data-set: "dpdk-compare-testbeds-skx-clx-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - "Legend to Table"
+    - "2n-skx, 2n-clx - testbeds and NICs tested."
+    - "Diff - difference between 2n-skx and 2n-clx testbeds."
  
-# DPDK Performance Results 3n-hsw
-- type: "file"
-  title: "DPDK Performance Results 3n-hsw"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
+- type: "table"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "3n-skx"
+      data-set: "dpdk-compare-topologies-ref"
+    - title: "2n-skx"
+      data-set: "dpdk-compare-topologies-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - "Legend to Table"
+    - "3n-skx, 2n-skx - topologies tested."
+    - "Diff - difference between 3n-skx and 2n-skx topologies."
+
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
+- type: "table"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
+  algorithm: "table_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-XXV710'"
+  columns:
+    - title: "3n-skx"
+      data-set: "dpdk-compare-topologies-ref"
+    - title: "2n-skx"
+      data-set: "dpdk-compare-topologies-cmp"
+  comparisons:
+    - title: "Diff"
+      reference: 1
+      compare: 2
+  legend:
+    - "Legend to Table"
+    - "3n-skx, 2n-skx - topologies tested."
+    - "Diff - difference between 3n-skx and 2n-skx topologies."
+
+# Detailed Test Results - DPDK Performance Results 3n-hsw
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
    data: "dpdk-perf-results-3n-hsw"
    filter: "all"
-  data-start-level: 4
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
  
-# DPDK Performance Results 3n-skx
-- type: "file"
-  title: "DPDK Performance Results 3n-skx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
+# Detailed Test Results - DPDK Performance Results 3n-skx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
    data: "dpdk-perf-results-3n-skx"
    filter: "all"
-  data-start-level: 4
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
  
-# DPDK Performance Results 2n-skx
-- type: "file"
-  title: "DPDK Performance Results 2n-skx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
+# Detailed Test Results - DPDK Performance Results 2n-skx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
    data: "dpdk-perf-results-2n-skx"
    filter: "all"
-  data-start-level: 4
+  remove-ndr: False
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
  
-# DPDK Performance Results 2n-clx
-- type: "file"
-  title: "DPDK Performance Results 2n-clx"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
+# Detailed Test Results - DPDK Performance Results 2n-clx
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-clx"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}/dpdk_performance_results_2n_clx"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
    data: "dpdk-perf-results-2n-clx"
    filter: "all"
-  data-start-level: 4
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
  
-# DPDK Performance Results 2n-dnv
-- type: "file"
-  title: "DPDK Performance Results 2n-dnv"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
+# Detailed Test Results - DPDK Performance Results 2n-dnv
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-dnv"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}/dpdk_performance_results_2n_dnv"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
    data: "dpdk-perf-results-2n-dnv"
    filter: "all"
-  data-start-level: 4
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
  
-# DPDK Performance Results 3n-dnv
-- type: "file"
-  title: "DPDK Performance Results 3n-dnv"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
+# Detailed Test Results - DPDK Performance Results 3n-dnv
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-dnv"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}/dpdk_performance_results_3n_dnv"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
    data: "dpdk-perf-results-3n-dnv"
    filter: "all"
-  data-start-level: 4
-
-# DPDK Performance Results 3n-tsh
-- type: "file"
-  title: "DPDK Performance Results 3n-tsh"
-  algorithm: "file_test_results"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-tsh
+- type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-tsh"
+  algorithm: "table_merged_details"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}/dpdk_performance_results_3n_tsh"
+  columns:
+    - title: " |prein| Test Name |preout| "
+      data: "data name"
+    - title: " |prein| Throughput: |br| 1.  Mpps       Gbps (NDR) |br| 2.  Mpps       Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3.  P50  P90  P99       P50  P90  P99 (10% PDR) |br| 4.  P50  P90  P99       P50  P90  P99 (50% PDR) |br| 5.  P50  P90  P99       P50  P90  P99 (90% PDR) |preout| "
+      data: "data msg"
    data: "dpdk-perf-results-3n-tsh"
    filter: "all"
-  data-start-level: 4
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
  
  ################################################################################
-###                                P L O T S                                 ###
+###                                F I L E S                                 ###
  ################################################################################
  
-# Hoststack tests 3n-hsw
-
-- type: "plot"
-  title: "Bandwidth: 3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3-bps"
-  data: "plot-vpp-hoststack-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpbase-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpbase-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps"
-  layout:
-    title: "3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "Bandwidth: 3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps"
-  data: "plot-vpp-hoststack-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpbase-Nsim-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpscale1Cl10S-Nsim-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps"
-  layout:
-    title: "3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3"
-    layout: "plot-hoststack"
-
-- type: "plot"
-  title: "Bandwidth: 3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho"
-  algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho-bps"
-  data: "plot-vpp-hoststack-3n-hsw"
-  include:
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicbase-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicbase-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale1Cl10S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale1cl10s-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale10Cl1S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale10cl1s-vppecho-bps"
-    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale10Cl10S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale10cl10s-vppecho-bps"
-  layout:
-    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"
+# VPP Performance Results
+- type: "file"
+  title: "VPP Performance Results"
+  algorithm: "file_details_split"
+  output-file: "{DIR[DTR,PERF,VPP,ALL]}"
+  dir-tables:
+    - "{DIR[DTR,PERF,VPP,2N,SKX]}"
+    - "{DIR[DTR,PERF,VPP,3N,SKX]}"
+    - "{DIR[DTR,PERF,VPP,2N,CLX]}"
+    - "{DIR[DTR,PERF,VPP,3N,HSW]}"
+    - "{DIR[DTR,PERF,VPP,3N,TSH]}"
+    - "{DIR[DTR,PERF,VPP,2N,DNV]}"
+    - "{DIR[DTR,PERF,VPP,3N,DNV]}"
    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"
+    - "vpp-perf-results-2n-skx"
+    - "vpp-perf-results-3n-skx"
+    - "vpp-perf-results-2n-clx"
+    - "vpp-perf-results-3n-hsw"
+    - "vpp-perf-results-3n-tsh"
+    - "vpp-perf-results-2n-dnv"
+    - "vpp-perf-results-3n-dnv"
+  filter: "all"
+  data-start-level: 4
+  order-chapters:
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
  
-- 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"
+# VPP Performance Configuration
+- type: "file"
+  title: "VPP Performance Configuration"
+  algorithm: "file_details_split"
+  output-file: "{DIR[DTC,PERF,VPP,ALL]}"
+  dir-tables:
+    - "{DIR[DTC,PERF,VPP,2N,SKX]}"
+    - "{DIR[DTC,PERF,VPP,3N,SKX]}"
+    - "{DIR[DTC,PERF,VPP,2N,CLX]}"
+    - "{DIR[DTC,PERF,VPP,3N,HSW]}"
+    - "{DIR[DTC,PERF,VPP,3N,TSH]}"
+    - "{DIR[DTC,PERF,VPP,2N,DNV]}"
+    - "{DIR[DTC,PERF,VPP,3N,DNV]}"
    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"
+    - "vpp-perf-results-2n-skx"
+    - "vpp-perf-results-3n-skx"
+    - "vpp-perf-results-2n-clx"
+    - "vpp-perf-results-3n-hsw"
+    - "vpp-perf-results-3n-tsh"
+    - "vpp-perf-results-2n-dnv"
+    - "vpp-perf-results-3n-dnv"
+  filter: "all"
+  data-start-level: 4
+  order-chapters:
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
  
-################################################################################
+# VPP Performance Operational
+- type: "file"
+  title: "VPP Performance Operational"
+  algorithm: "file_details_split_html"
+  output-file: "{DIR[DTO,PERF,VPP,ALL]}"
+  dir-tables:
+    - "{DIR[DTO,PERF,VPP,2N,SKX]}"
+    - "{DIR[DTO,PERF,VPP,3N,SKX]}"
+    - "{DIR[DTO,PERF,VPP,2N,CLX]}"
+    - "{DIR[DTO,PERF,VPP,3N,HSW]}"
+    - "{DIR[DTO,PERF,VPP,3N,TSH]}"
+    - "{DIR[DTO,PERF,VPP,2N,DNV]}"
+    - "{DIR[DTO,PERF,VPP,3N,DNV]}"
+  data:
+    - "vpp-perf-results-2n-skx"
+    - "vpp-perf-results-3n-skx"
+    - "vpp-perf-results-2n-clx"
+    - "vpp-perf-results-3n-hsw"
+    - "vpp-perf-results-3n-tsh"
+    - "vpp-perf-results-2n-dnv"
+    - "vpp-perf-results-3n-dnv"
+  filter: "all"
+  data-start-level: 4
+  order-chapters:
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
  
-# Soak Test (PLRsearch), boxes - 2n-clx
-- type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
-  algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
-  data: "plot-vpp-soak-2n-clx"
-  include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
-  layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
+# VPP MRR Results
+- type: "file"
+  title: "VPP MRR Results"
+  algorithm: "file_details_split"
+  output-file: "{DIR[DTR,MRR,VPP,ALL]}"
+  dir-tables:
+    - "{DIR[DTR,MRR,VPP,2N,SKX]}"
+    - "{DIR[DTR,MRR,VPP,3N,SKX]}"
+    - "{DIR[DTR,MRR,VPP,2N,CLX]}"
+    - "{DIR[DTR,MRR,VPP,3N,HSW]}"
+    - "{DIR[DTR,MRR,VPP,3N,TSH]}"
+    - "{DIR[DTR,MRR,VPP,2N,DNV]}"
+    - "{DIR[DTR,MRR,VPP,3N,DNV]}"
+  data:
+    - "vpp-mrr-results-2n-skx"
+    - "vpp-mrr-results-3n-skx"
+    - "vpp-mrr-results-2n-clx"
+    - "vpp-mrr-results-3n-hsw"
+    - "vpp-mrr-results-3n-tsh"
+    - "vpp-mrr-results-2n-dnv"
+    - "vpp-mrr-results-3n-dnv"
+  filter: "all"
+  data-start-level: 4
+  order-chapters:
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
+
+# VPP MRR Configuration
+- type: "file"
+  title: "VPP MRR Configuration"
+  algorithm: "file_details_split"
+  output-file: "{DIR[DTC,MRR,VPP,ALL]}"
+  dir-tables:
+    - "{DIR[DTC,MRR,VPP,2N,SKX]}"
+    - "{DIR[DTC,MRR,VPP,3N,SKX]}"
+    - "{DIR[DTC,MRR,VPP,2N,CLX]}"
+    - "{DIR[DTC,MRR,VPP,3N,HSW]}"
+    - "{DIR[DTC,MRR,VPP,3N,TSH]}"
+    - "{DIR[DTC,MRR,VPP,2N,DNV]}"
+    - "{DIR[DTC,MRR,VPP,3N,DNV]}"
+  data:
+    - "vpp-mrr-results-2n-skx"
+    - "vpp-mrr-results-3n-skx"
+    - "vpp-mrr-results-2n-clx"
+    - "vpp-mrr-results-3n-hsw"
+    - "vpp-mrr-results-3n-tsh"
+    - "vpp-mrr-results-2n-dnv"
+    - "vpp-mrr-results-3n-dnv"
+  filter: "all"
+  data-start-level: 4
+  order-chapters:
+    level-1:
+      - "l2"
+      - "ip4"
+      - "ip6"
+      - "srv6"
+      - "ip4_tunnels"
+      - "ip6_tunnels"
+      - "vm_vhost"
+      - "container_memif"
+      - "crypto"
+      - "vts"
+      - "lb"
+      - "nfv_density"
+      - "hoststack"
+    level-2:
+      - "2n-skx"
+      - "3n-skx"
+      - "2n-clx"
+      - "3n-hsw"
+      - "3n-tsh"
+      - "2n-dnv"
+      - "3n-dnv"
+    level-3:
+      - "xl710"
+      - "x520"
+      - "xxv710"
+      - "x710"
+      - "x553"
+      - "cx556a"
+      - "vic1227"
+      - "vic1385"
+
+# VPP Device Results - Ubuntu
+- type: "file"
+  title: "VPP Device Results - Ubuntu"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
+  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  data-start-level: 4
+
+# VPP Device Configuration - Ubuntu
+- type: "file"
+  title: "VPP Device Configuration - Ubuntu"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
+  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 3n-hsw
+- type: "file"
+  title: "DPDK Performance Results 3n-hsw"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
+  data: "dpdk-perf-results-3n-hsw"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 3n-skx
+- type: "file"
+  title: "DPDK Performance Results 3n-skx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
+  data: "dpdk-perf-results-3n-skx"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 2n-skx
+- type: "file"
+  title: "DPDK Performance Results 2n-skx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
+  data: "dpdk-perf-results-2n-skx"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 2n-clx
+- type: "file"
+  title: "DPDK Performance Results 2n-clx"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,CLX]}"
+  data: "dpdk-perf-results-2n-clx"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 2n-dnv
+- type: "file"
+  title: "DPDK Performance Results 2n-dnv"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,DNV]}"
+  data: "dpdk-perf-results-2n-dnv"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 3n-dnv
+- type: "file"
+  title: "DPDK Performance Results 3n-dnv"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,DNV]}"
+  data: "dpdk-perf-results-3n-dnv"
+  filter: "all"
+  data-start-level: 4
+
+# DPDK Performance Results 3n-tsh
+- type: "file"
+  title: "DPDK Performance Results 3n-tsh"
+  algorithm: "file_test_results"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,TSH]}"
+  data: "dpdk-perf-results-3n-tsh"
+  filter: "all"
+  data-start-level: 4
+
+################################################################################
+###                                P L O T S                                 ###
+################################################################################
+
+# Hoststack tests 3n-hsw
  
-# Soak Test (PLRsearch), boxes - 2n-clx
  - type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  title: "Bandwidth: 3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3"
    algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
-  data: "plot-vpp-soak-2n-clx"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3-bps"
+  data: "plot-vpp-hoststack-3n-hsw"
    include:
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
-    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
-    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-soak"
-    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-soak"
+    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpbase-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpbase-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpscale1Cl10S-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps"
    layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
+    title: "3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-ldpreload-iperf3"
+    layout: "plot-hoststack"
  
-# Soak Test (PLRsearch), boxes - 2n-skx
  - type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  title: "Bandwidth: 3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3"
    algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-1"
-  data: "plot-vpp-soak-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3-bps"
+  data: "plot-vpp-hoststack-3n-hsw"
    include:
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
-    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
-    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
+    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpbase-Nsim-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps"
+    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Tcpscale1Cl10S-Nsim-Ldpreload-Iperf3-Bps.1460B-1t1c-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps"
    layout:
-    title: "30 Minutes Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
+    title: "3n-hsw-xl710-1460b-1t1c-eth-ip4tcp-nsim-ldpreload-iperf3"
+    layout: "plot-hoststack"
  
-# Soak Test (PLRsearch), boxes - 2n-skx
  - type: "plot"
-  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  title: "Bandwidth: 3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho"
    algorithm: "plot_perf_box_name"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-2"
+  output-file: "{DIR[STATIC,VPP]}/3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho-bps"
+  data: "plot-vpp-hoststack-3n-hsw"
+  include:
+    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicbase-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicbase-vppecho-bps"
+    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale1Cl10S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale1cl10s-vppecho-bps"
+    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale10Cl1S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale10cl1s-vppecho-bps"
+    - "Tests.Vpp.Perf.Hoststack.40Ge2P1Xl710-Eth-Ip4Udpquicscale10Cl10S-Vppecho-Bps.1280B-1t1c-eth-ip4udpquicscale10cl10s-vppecho-bps"
+  layout:
+    title: "3n-hsw-xl710-1280b-1t1c-eth-ip4udpquic-vppecho"
+    layout: "plot-hoststack"
+
+## Plots VPP HTTP Server Performance
+#- type: "plot"
+#  title: "VPP HTTP Server Performance"
+#  algorithm: "plot_http_server_perf_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
+#  data:
+#    "plot-vpp-http-server-performance"
+#  filter: "'HTTP' and 'TCP_CPS' and not '8T4C'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  traces:
+#    hoverinfo: "y+name"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "VPP HTTP Server Performance"
+#    layout:
+#      "plot-cps"
+#
+#- type: "plot"
+#  title: "VPP HTTP Server Performance"
+#  algorithm: "plot_http_server_perf_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
+#  data:
+#    "plot-vpp-http-server-performance"
+#  filter: "'HTTP' and 'TCP_RPS' and not '8T4C'"
+#  parameters:
+#  - "result"
+#  - "name"
+#  traces:
+#    hoverinfo: "y+name"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "VPP HTTP Server Performance"
+#    layout:
+#      "plot-rps"
+
+################################################################################
+
+# Soak Test (PLRsearch), boxes - 2n-clx
+- type: "plot"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  algorithm: "plot_perf_box_name"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-1"
+  data: "plot-vpp-soak-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
+  layout:
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
+# Soak Test (PLRsearch), boxes - 2n-clx
+- type: "plot"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  algorithm: "plot_perf_box_name"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2"
+  data: "plot-vpp-soak-2n-clx"
+  include:
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
+    - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Base-Soak.78B-2t1c-ethip6-ip6base-soak"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
+    - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Memif-1Dcr-Soak.64B-2t1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-soak"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-soak"
+    - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-soak"
+  layout:
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
+# Soak Test (PLRsearch), boxes - 2n-skx
+- type: "plot"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  algorithm: "plot_perf_box_name"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-1"
+  data: "plot-vpp-soak-2n-skx"
+  include:
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Soak.64B-2t1c-avf-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-avf-eth-l2bdbasemaclrn-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Soak.64B-2t1c-eth-l2xcbase-soak"
+    - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Soak.64B-2t1c-eth-l2bdbasemaclrn-soak"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Soak.64B-2t1c-avf-ethip4-ip4base-soak"
+    - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Soak.64B-2t1c-ethip4-ip4base-soak"
+  layout:
+    title: "30 Minutes Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
+
+# Soak Test (PLRsearch), boxes - 2n-skx
+- type: "plot"
+  title: "VPP Critical rate: 30 Minutes Soak Test (PLRsearch)"
+  algorithm: "plot_perf_box_name"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/soak-test-2n-skx-2"
    data: "plot-vpp-soak-2n-skx"
    include:
      - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Avf-Ethip6-Ip6Base-Soak.78B-2t1c-avf-ethip6-ip6base-soak"
@@ -6436,49 +7280,49 @@
  # 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"
@@ -6488,7 +7332,7 @@
  # 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"
@@ -6502,7 +7346,7 @@
      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"
@@ -6516,7 +7360,7 @@
      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"
@@ -6529,1546 +7373,426 @@
      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'"
@@ -8076,81 +7800,159 @@
    - "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'"
@@ -8158,26 +7960,25 @@
    - "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'"
@@ -8185,26 +7986,25 @@
    - "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'"
@@ -8212,104 +8012,184 @@
    - "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
@@ -8317,7 +8197,7 @@
             'IPSEC' and
             'TNL_4' and
             'IMIX' and
-           '1T1C' and
+           '2T1C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8334,9 +8214,9 @@
  - 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
@@ -8344,7 +8224,7 @@
             'IPSEC' and
             'TNL_4' and
             'IMIX' and
-           '2T2C' and
+           '4T2C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8361,9 +8241,9 @@
  - 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
@@ -8371,7 +8251,7 @@
             'IPSEC' and
             'TNL_4' and
             'IMIX' and
-           '4T4C' and
+           '8T4C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8389,9 +8269,9 @@
  - 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
@@ -8399,7 +8279,7 @@
             'IPSEC' and
             'TNL_4' and
             'IMIX' and
-           '1T1C' and
+           '2T1C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8416,9 +8296,9 @@
  - 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
@@ -8426,7 +8306,7 @@
             'IPSEC' and
             'TNL_4' and
             'IMIX' and
-           '2T2C' and
+           '4T2C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8443,9 +8323,9 @@
  - 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
@@ -8453,7 +8333,7 @@
             'IPSEC' and
             'TNL_4' and
             'IMIX' and
-           '4T4C' and
+           '8T4C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8469,21 +8349,74 @@
  
  ###############################################################################
  
-## 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"
@@ -8492,15 +8425,182 @@
  #  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
@@ -8510,7 +8610,7 @@
  #           'IPSEC' and
  #           'TNL_1000' and
  #           'IMIX' and
-#           '4T2C' and
+#           '2T1C' and
  #           'MRR'"
  #  parameters:
  #  - "result"
@@ -8527,7 +8627,7 @@
  #- 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
@@ -8537,274 +8637,54 @@
  #           '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
@@ -8812,7 +8692,7 @@
             'IPSEC' and
             'TNL_1000' and
             'IMIX' and
-           '1T1C' and
+           '2T1C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8829,9 +8709,9 @@
  - 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
@@ -8839,7 +8719,7 @@
             'IPSEC' and
             'TNL_1000' and
             'IMIX' and
-           '2T2C' and
+           '4T2C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8856,9 +8736,9 @@
  - 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
@@ -8866,7 +8746,7 @@
             'IPSEC' and
             'TNL_1000' and
             'IMIX' and
-           '4T4C' and
+           '8T4C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8884,9 +8764,9 @@
  - 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
@@ -8894,7 +8774,7 @@
             'IPSEC' and
             'TNL_1000' and
             'IMIX' and
-           '1T1C' and
+           '2T1C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8911,9 +8791,9 @@
  - 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
@@ -8921,7 +8801,7 @@
             'IPSEC' and
             'TNL_1000' and
             'IMIX' and
-           '2T2C' and
+           '4T2C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8938,9 +8818,9 @@
  - 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
@@ -8948,7 +8828,7 @@
             'IPSEC' and
             'TNL_1000' and
             'IMIX' and
-           '4T4C' and
+           '8T4C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -8964,6 +8844,253 @@
  
  ###############################################################################
  
+## 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"
@@ -9022,284 +9149,37 @@
  #- 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
@@ -9307,7 +9187,7 @@
             'IPSEC' and
             'TNL_10000' and
             'IMIX' and
-           '1T1C' and
+           '2T1C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -9324,9 +9204,9 @@
  - 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
@@ -9334,7 +9214,7 @@
             'IPSEC' and
             'TNL_10000' and
             'IMIX' and
-           '2T2C' and
+           '4T2C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -9351,9 +9231,9 @@
  - 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
@@ -9361,7 +9241,7 @@
             'IPSEC' and
             'TNL_10000' and
             'IMIX' and
-           '4T4C' and
+           '8T4C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -9379,9 +9259,9 @@
  - 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
@@ -9389,7 +9269,7 @@
             'IPSEC' and
             'TNL_10000' and
             'IMIX' and
-           '1T1C' and
+           '2T1C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -9406,9 +9286,9 @@
  - 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
@@ -9416,7 +9296,7 @@
             'IPSEC' and
             'TNL_10000' and
             'IMIX' and
-           '2T2C' and
+           '4T2C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -9433,9 +9313,9 @@
  - 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
@@ -9443,7 +9323,7 @@
             'IPSEC' and
             'TNL_10000' and
             'IMIX' and
-           '4T4C' and
+           '8T4C' and
             'NDRPDR'"
    parameters:
    - "throughput"
@@ -9459,481 +9339,490 @@
  
  ###############################################################################
  
-# 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
  
@@ -10959,8 +10848,8 @@
    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"
@@ -10977,7 +10866,7 @@
      - "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"
@@ -11285,7 +11174,7 @@
    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:
@@ -11300,7 +11189,7 @@
    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:
@@ -12140,35 +12029,35 @@
      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"
@@ -12952,9 +12841,9 @@
      - "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"
@@ -12968,9 +12857,9 @@
      - "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"
@@ -16787,7 +16676,7 @@
    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"
@@ -16801,7 +16690,7 @@
    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"
@@ -16831,6 +16720,7 @@
    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"
@@ -17081,7 +16971,7 @@
      - "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"
@@ -17097,7 +16987,7 @@
      - "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"
@@ -18579,9 +18469,9 @@
      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"
@@ -18589,7 +18479,7 @@
      - "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"