Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
CSIT-1440: Re-organize graphs in report
[csit.git] / resources / tools / presentation / specification.yaml
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index b0b50f8..11e7eb9 100644 (file)
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -126,930 +126,798 @@
 
   data-sets:
 
 
   data-sets:
 
-    # Denverton:
-    intel-dnv-vpp:
-      # TODO: Replace with new data
-      intel-dnv-vpp-release-1810:
-      - 1
+    ###########################################################################
+    # Plots:
 
 
-    # VPP Performance
-    vpp-performance-changes-3n-hsw:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 11  # NDRPDR full 1
-      - 22  # NDRPDR full 2
-      - 45  # NDRPDR full 3
-      - 46  # NDRPDR full 4
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 47  # NDRPDR sel
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-      # TODO Add new data
+    # 3n-hsw
+
+    plot-vpp-throughput-latency-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
 
 
-    vpp-nic-comparison-3n-hsw:
-      # TODO: Add new data
+    plot-throughput-speedup-analysis-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
 
 
-    vpp-performance-changes-3n-skx:
-      csit-vpp-perf-verify-1807-3n-skx:
-      - 33  # NDRPDR sel
-      - 35  # NDRPDR sel
-      - 37  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 43  # NDRPDR sel
-      - 44  # NDRPDR sel
-      - 49  # NDRPDR sel
-      - 50  # NDRPDR sel
-      - 56  # NDRPDR sel
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
+    plot-vpp-http-server-performance:
+      # TODO: Replace with new data
+      # csit-vpp-perf-verify-1901-3n-hsw:
+      csit-vpp-perf-verify-1810-3n-hsw:
+        - 28  # WRK
+        - 29  # WRK
+        - 30  # WRK
+        - 31  # WRK
+        - 32  # WRK
+        - 33  # WRK
+        - 34  # WRK
+        - 35  # WRK
+        - 36  # WRK
+        - 37  # WRK
+
+    plot-ligato-throughput-latency-3n-hsw:
+      csit-ligato-perf-verify-1901-3n-hsw:
+        - 8   # NDRPDR sel
+        - 9   # 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
+
+    plot-ligato-throughput-speedup-analysis-3n-hsw:
+      csit-ligato-perf-verify-1901-3n-hsw:
+        - 8   # NDRPDR sel
+        - 9   # 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
+
+    plot-dpdk-throughput-latency-3n-hsw:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 13  # NDRPDR sel
+        - 14  # 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
+
+    # 3n-skx
+
+    plot-vpp-throughput-latency-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
 
 
-    vpp-nic-comparison-3n-skx:
+    plot-throughput-speedup-analysis-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
 
 
-    vpp-performance-changes-2n-skx:
-      csit-vpp-perf-verify-1807-2n-skx:
-      - 26  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 29  # NDRPDR sel
-      - 30  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 35  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
+    plot-dpdk-throughput-latency-3n-skx:
+      csit-dpdk-perf-verify-1901-3n-skx:
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+
+    # 2n-skx
+
+    plot-vpp-throughput-latency-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
 
 
-    vpp-nic-comparison-2n-skx:
+    plot-throughput-speedup-analysis-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
 
 
-    vpp-compare-testbeds:
+    plot-vpp-soak-2n-skx:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 45  # SOAK sel
+
+    plot-vpp-nfv-2n-skx:
       # TODO: Add new data
       # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 28  # NFV NDRPDR
+        - 29  # NFV NDRPDR
+        - 32  # NFV NDRPDR
+        - 39  # NFV NDRPDR
+        - 46  # NFV NDRPDR
 
 
-    vpp-compare-testbeds-mrr:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    plot-vpp-nfv-2n-skx-mrr:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 24  # NFV MRR
+        - 26  # NFV MRR
+        - 27  # NFV MRR
+        - 35  # NFV MRR
+        - 37  # NFV MRR
 
 
-    vpp-compare-topologies:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
+    plot-dpdk-throughput-latency-2n-skx:
+      csit-dpdk-perf-verify-1901-2n-skx:
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
 
 
-    vpp-compare-topologies-mrr:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+    # 3rd party
 
 
-    vpp-performance-changes-3n-hsw-mrr:
-      csit-vpp-perf-verify-1807-3n-hsw:
-      - 8   # MRR full
-      - 9   # MRR sel
-      - 21  # MRR sel
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 36  # MRR sel
-      - 41  # MRR sel
-      - 42  # MRR sel
-      - 48  # MRR sel
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    # Denverton:
+    intel-dnv-vpp:
+      # Not used
+      intel-dnv-vpp-release-1810:
+        - 1
 
 
-    vpp-nic-comparison-3n-hsw-mrr:
+    ###########################################################################
+    # Simple tables (only one data set):
+
+    # NIC Comparisons
+
+    vpp-nic-comparison-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
 
 
-    vpp-performance-changes-3n-skx-mrr:
-      csit-vpp-perf-verify-1807-3n-skx:
-      - 28  # MRR sel
-      - 32  # MRR sel
-      - 36  # MRR sel
-      - 42  # MRR sel
-      - 47  # MRR sel
-      - 48  # MRR sel
-      - 51  # MRR sel
-      - 52  # MRR sel
-      - 53  # MRR sel
-      - 54  # MRR sel
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+    vpp-nic-comparison-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+
+    vpp-nic-comparison-2n-skx:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+
+    vpp-nic-comparison-3n-hsw-mrr:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 35  # MRR sel
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1901-3n-skx:
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-
-    vpp-performance-changes-2n-skx-mrr:
-      csit-vpp-perf-verify-1807-2n-skx:
-      - 31  # MRR sel
-      - 33  # MRR sel
-      - 37  # MRR sel
-      - 38  # MRR sel
-      - 41  # MRR sel
-      - 43  # MRR sel
-      - 44  # MRR sel
-      - 45  # MRR sel
-      - 46  # MRR sel
-      - 47  # MRR sel
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+        - 32  # MRR sel
 
     vpp-nic-comparison-2n-skx-mrr:
       csit-vpp-perf-verify-1901-2n-skx:
 
     vpp-nic-comparison-2n-skx-mrr:
       csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
+        - 22  # MRR sel
+
+    # Results
 
     vpp-perf-results-3n-hsw:
 
     vpp-perf-results-3n-hsw:
-      # TODO: Add FULL data
       csit-vpp-perf-verify-1901-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-      - 38  # NDRPDR full
-      - 43  # NDRPDR full
+        - 38  # NDRPDR full
+        - 43  # NDRPDR full
+        - 45  # NDRPDR full
+        - 49  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 37  # NDRPDR full
-      - 39  # NDRPDR full
-      - 40  # NDRPDR full
-      - 49  # NDRPDR full
+        - 37  # NDRPDR full
+        - 39  # NDRPDR full
+        - 40  # NDRPDR full
+        - 49  # NDRPDR full
 
     vpp-perf-results-2n-skx:
 
     vpp-perf-results-2n-skx:
-      # TODO: Add FULL data
       csit-vpp-perf-verify-1901-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
-      - 25  # NDRPDR full
-      - 30  # NDRPDR full
-      - 33  # NDRPDR full
+        - 25  # NDRPDR full
+        - 30  # NDRPDR full
+        - 33  # NDRPDR full
+        - 44  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
 
     vpp-mrr-results-3n-hsw:
       csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+        - 35  # MRR sel
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
 
     vpp-mrr-results-3n-skx:
       csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+        - 32  # MRR sel
 
     vpp-mrr-results-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
 
     vpp-mrr-results-2n-skx:
       csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-
-    plot-throughput-speedup-analysis-3n-hsw:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-
-    plot-throughput-speedup-analysis-3n-skx:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-
-    plot-throughput-speedup-analysis-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-
-    plot-vpp-throughput-latency-3n-hsw:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-
-    plot-vpp-soak-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 45  # SOAK sel
-
-    plot-vpp-nfv-2n-skx:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 28  # NFV NDRPDR
-      - 29  # NFV NDRPDR
-      - 32  # NFV NDRPDR
-      - 39  # NFV NDRPDR
-
-    plot-vpp-nfv-2n-skx-mrr:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 24  # NFV MRR
-      - 26  # NFV MRR
-      - 27  # NFV MRR
-      - 35  # NFV MRR
-      - 37  # NFV MRR
-
-    plot-vpp-throughput-latency-3n-skx:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-
-    plot-vpp-throughput-latency-2n-skx:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-
-    plot-vpp-http-server-performance:
-      # TODO: Replace with new data
-      # csit-vpp-perf-verify-1901-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 28  # WRK
-      - 29  # WRK
-      - 30  # WRK
-      - 31  # WRK
-      - 32  # WRK
-      - 33  # WRK
-      - 34  # WRK
-      - 35  # WRK
-      - 36  # WRK
-      - 37  # WRK
+        - 22  # MRR sel
 
 
-    # VPP Functional
     vpp-func-results-ubuntu:
       csit-vpp-functional-1901-ubuntu1604-virl:
     vpp-func-results-ubuntu:
       csit-vpp-functional-1901-ubuntu1604-virl:
-      - 48
+        - 48
 
     vpp-func-results-centos:
       csit-vpp-functional-1901-centos7-virl:
 
     vpp-func-results-centos:
       csit-vpp-functional-1901-centos7-virl:
-      - 50
+        - 50
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1901-ubuntu1804-1n-skx:
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1901-ubuntu1804-1n-skx:
-      - 49
+        - 49
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
 
     # VPP Ligato
     ligato-perf-results-3n-hsw:
-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
+      csit-ligato-perf-verify-1901-3n-hsw:
+        - 10  # NDRPDR full
 
 
-    plot-ligato-throughput-speedup-analysis-3n-hsw:
-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
-      - 6   # sel
-      - 8   # sel
-      - 9   # sel
-      - 11  # sel
-      - 12  # sel
-      - 13  # sel
-      - 14  # sel
-      - 16  # sel
-      - 17  # sel
-      - 18  # sel
-
-    plot-ligato-throughput-latency-3n-hsw:
-      # TODO: Replace with new data
-      # csit-ligato-perf-verify-1901-3n-hsw:
-      csit-ligato-perf-verify-1810-3n-hsw:
-      - 5   # full
-      - 6   # sel
-      - 8   # sel
-      - 9   # sel
-      - 11  # sel
-      - 12  # sel
-      - 13  # sel
-      - 14  # sel
-      - 16  # sel
-      - 17  # sel
-      - 18  # sel
-
-    # DPDK Performance
-    dpdk-performance-changes-3n-hsw:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 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-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-
-    dpdk-performance-changes-3n-skx:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
-      - 3   # 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-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # 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
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-
-    dpdk-performance-changes-2n-skx:
-      csit-dpdk-perf-verify-1810-2n-skx:
-      - 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
-      - 13  # NDRPDR sel
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-
-    dpdk-compare-testbeds:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-
-    dpdk-compare-topologies:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-
-    dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 20  # NDRPDR sel
+    dpdk-perf-results-3n-hsw:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 20  # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
 
     dpdk-perf-results-3n-skx:
       csit-dpdk-perf-verify-1901-3n-skx:
-      - 13  # NDRPDR sel
+        - 13  # NDRPDR sel
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
 
     dpdk-perf-results-2n-skx:
       csit-dpdk-perf-verify-1901-2n-skx:
-      - 21  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-3n-hsw:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-2n-skx:
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
+        - 21  # NDRPDR sel
 
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1901-ubuntu1604:
 
     # HoneyComb Functional
     hc-func-results:
       csit-hc2vpp-verify-func-1901-ubuntu1604:
-      - 3
+        - 3
 
     # NSH SFC Functional
     nsh-func-results:
 
     # NSH SFC Functional
     nsh-func-results:
-      # TODO: Replace with new data
-      # csit-nsh_sfc-verify-func-1901-ubuntu1604-virl:
+      # Not used
       csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
       csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
-      - 1
+        - 1
 
     # DMM Functional
     dmm-func-results:
       csit-dmm-functional-1901-ubuntu1604-virl:
 
     # DMM Functional
     dmm-func-results:
       csit-dmm-functional-1901-ubuntu1604-virl:
-      - 2
+        - 2
 
 
-  plot-layouts:
+    ###########################################################################
+    # Tables (more than one data set)
 
 
-    plot-soak-throughput:
-      titlefont:
-        size: 18
-      xaxis:
-        title: "<b>Test Cases [Index]</b>"
-        titlefont:
-          size: 16
-        autorange: True
-        fixedrange: False
-        gridcolor: "rgb(230, 230, 230)"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickmode: "linear"
-        tickfont:
-          size: 16
-        zeroline: False
-      yaxis:
-        title: "<b>Packet Throughput [Mpps]</b>"
-        titlefont:
-          size: 16
-        gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        tickformat: ".3s"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickfont:
-          size: 16
-        zeroline: False
-        range: [0,50]
-      autosize: False
-      margin:
-        t: 50
-        b: 0
-        l: 80
-        r: 20
-      showlegend: True
-      legend:
-        orientation: "h"
-        font:
-          size: 16
-      width: 700
-      height: 900
+    # Performance changes
 
 
-    plot-service-density:
-      titlefont:
-        size: 18
-      xaxis:
-        side: "top"
-        autorange: True
-        fixedrange: False
-        showgrid: False
-        showline: False
-        showticklabels: False
-        ticks: ""
-        ticklen: 0
-        tickwidth: 0
-        zeroline: False
-      yaxis:
-        autorange: "reversed"
-        showgrid: False
-        showline: False
-        showticklabels: False
-        ticks: ""
-        ticklen: 0
-        tickwidth: 0
-        zeroline: False
-      autosize: True
-      showlegend: False
-      width: 700
-      height: 700
-
-    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
+    vpp-performance-changes-3n-hsw-h1:
+      csit-vpp-perf-verify-1807-3n-hsw:
+        - 11  # NDRPDR full 1
+        - 22  # NDRPDR full 2
+        - 45  # NDRPDR full 3
+        - 46  # NDRPDR full 4
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 47  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-ref:
+      csit-vpp-perf-verify-1810-3n-hsw:
+        - 8   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 25  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 39  # NDRPDR sel
+        - 41  # NDRPDR sel
+        - 42  # NDRPDR sel
+    vpp-performance-changes-3n-hsw-cmp:
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 10  # NDRPDR sel
+      - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 46  # NDRPDR sel
+      - 47  # NDRPDR sel
+      - 48  # NDRPDR sel
+    vpp-performance-changes-3n-hsw:
+      - "vpp-performance-changes-3n-hsw-h1"
+      - "vpp-performance-changes-3n-hsw-ref"
+      - "vpp-performance-changes-3n-hsw-cmp"
 
 
-    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
+    vpp-performance-changes-3n-skx-h1:
+      csit-vpp-perf-verify-1807-3n-skx:
+        - 33  # NDRPDR sel
+        - 35  # NDRPDR sel
+        - 37  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 39  # NDRPDR sel
+        - 43  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 49  # NDRPDR sel
+        - 50  # NDRPDR sel
+        - 56  # NDRPDR sel
+    vpp-performance-changes-3n-skx-ref:
+      csit-vpp-perf-verify-1810-3n-skx:
+        - 10  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 25  # NDRPDR sel
+    vpp-performance-changes-3n-skx-cmp:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+    vpp-performance-changes-3n-skx:
+      - "vpp-performance-changes-3n-skx-h1"
+      - "vpp-performance-changes-3n-skx-ref"
+      - "vpp-performance-changes-3n-skx-cmp"
 
 
-    plot-throughput:
-      titlefont:
-        size: 18
-      xaxis:
-        title: "<b>Test Cases [Index]</b>"
-        titlefont:
-          size: 16
-        autorange: True
-        fixedrange: False
-        gridcolor: "rgb(230, 230, 230)"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickmode: "linear"
-        tickfont:
-          size: 16
-        zeroline: False
-      yaxis:
-        title: "<b>Packet Throughput [Mpps]</b>"
-        titlefont:
-          size: 16
-        gridcolor: "rgb(230, 230, 230)"
-        hoverformat: ".4s"
-        tickformat: ".3s"
-        linecolor: "rgb(220, 220, 220)"
-        linewidth: 1
-        showgrid: True
-        showline: True
-        showticklabels: True
-        tickcolor: "rgb(220, 220, 220)"
-        tickfont:
-          size: 16
-        zeroline: False
-        range: [0,50]
-      boxmode: "group"
-      boxgroupgap: 0.5
-      autosize: False
-      margin:
-        t: 50
-        b: 0
-        l: 80
-        r: 20
-      showlegend: True
-      legend:
-        orientation: "h"
-        font:
-          size: 16
-      width: 700
-      height: 900
+    vpp-performance-changes-2n-skx-h1:
+      csit-vpp-perf-verify-1807-2n-skx:
+        - 26  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 29  # NDRPDR sel
+        - 30  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 35  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 39  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+    vpp-performance-changes-2n-skx-ref:
+      csit-vpp-perf-verify-1810-2n-skx:
+        - 9   # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 22  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 24  # NDRPDR sel
+        - 27  # NDRPDR sel
+    vpp-performance-changes-2n-skx-cmp:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+    vpp-performance-changes-2n-skx:
+      - "vpp-performance-changes-2n-skx-h1"
+      - "vpp-performance-changes-2n-skx-ref"
+      - "vpp-performance-changes-2n-skx-cmp"
 
 
-    plot-throughput-speedup-analysis:
-      titlefont:
-        size: 18
-      xaxis:
-        title: "<b>Number of Cores [Qty]</b>"
-        titlefont:
+    vpp-performance-changes-3n-hsw-mrr-h1:
+      csit-vpp-perf-verify-1807-3n-hsw:
+        - 8   # MRR full
+        - 9   # MRR sel
+        - 21  # MRR sel
+        - 31  # MRR sel
+        - 33  # MRR sel
+        - 36  # MRR sel
+        - 41  # MRR sel
+        - 42  # MRR sel
+        - 48  # MRR sel
+    vpp-performance-changes-3n-hsw-mrr-ref:
+      csit-vpp-perf-verify-1810-3n-hsw:
+        - 9   # MRR sel
+    vpp-performance-changes-3n-hsw-mrr-cmp:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 35  # MRR sel
+    vpp-performance-changes-3n-hsw-mrr:
+      - "vpp-performance-changes-3n-hsw-mrr-h1"
+      - "vpp-performance-changes-3n-hsw-mrr-ref"
+      - "vpp-performance-changes-3n-hsw-mrr-cmp"
+
+    vpp-performance-changes-3n-skx-mrr-h1:
+      csit-vpp-perf-verify-1807-3n-skx:
+        - 28  # MRR sel
+        - 32  # MRR sel
+        - 36  # MRR sel
+        - 42  # MRR sel
+        - 47  # MRR sel
+        - 48  # MRR sel
+        - 51  # MRR sel
+        - 52  # MRR sel
+        - 53  # MRR sel
+        - 54  # MRR sel
+    vpp-performance-changes-3n-skx-mrr-ref:
+      csit-vpp-perf-verify-1810-3n-skx:
+        - 9   # MRR sel
+        - 11  # MRR sel
+        - 12  # MRR sel
+        - 13  # MRR sel
+    vpp-performance-changes-3n-skx-mrr-cmp:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 32  # MRR sel
+    vpp-performance-changes-3n-skx-mrr:
+      - "vpp-performance-changes-3n-skx-mrr-h1"
+      - "vpp-performance-changes-3n-skx-mrr-ref"
+      - "vpp-performance-changes-3n-skx-mrr-cmp"
+
+    vpp-performance-changes-2n-skx-mrr-h1:
+      csit-vpp-perf-verify-1807-2n-skx:
+        - 31  # MRR sel
+        - 33  # MRR sel
+        - 37  # MRR sel
+        - 38  # MRR sel
+        - 41  # MRR sel
+        - 43  # MRR sel
+        - 44  # MRR sel
+        - 45  # MRR sel
+        - 46  # MRR sel
+        - 47  # MRR sel
+    vpp-performance-changes-2n-skx-mrr-ref:
+      csit-vpp-perf-verify-1810-2n-skx:
+        - 8   # MRR sel
+        - 10  # MRR sel
+        - 11  # MRR sel
+        - 12  # MRR sel
+    vpp-performance-changes-2n-skx-mrr-cmp:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 22  # MRR sel
+    vpp-performance-changes-2n-skx-mrr:
+      - "vpp-performance-changes-2n-skx-mrr-h1"
+      - "vpp-performance-changes-2n-skx-mrr-ref"
+      - "vpp-performance-changes-2n-skx-mrr-cmp"
+
+    dpdk-performance-changes-3n-hsw-h1:
+      csit-dpdk-perf-verify-1807-3n-hsw:
+        - 11
+        - 12  # full
+        - 14
+        - 15
+        - 16
+        - 17
+        - 20
+        - 21
+        - 22
+        - 23
+    dpdk-performance-changes-3n-hsw-ref:
+      csit-dpdk-perf-verify-1810-3n-hsw:
+        - 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-3n-hsw-cmp:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 13  # NDRPDR sel
+        - 14  # 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
+    dpdk-performance-changes-3n-hsw:
+      - "dpdk-performance-changes-3n-hsw-h1"
+      - "dpdk-performance-changes-3n-hsw-ref"
+      - "dpdk-performance-changes-3n-hsw-cmp"
+
+    dpdk-performance-changes-3n-skx-h1:
+      csit-dpdk-perf-verify-1807-3n-skx:
+        - 1   # NDRPDR sel
+        - 2   # NDRPDR sel
+        - 3   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+    dpdk-performance-changes-3n-skx-ref:
+      csit-dpdk-perf-verify-1810-3n-skx:
+        - 3   # NDRPDR sel
+        - 4   # 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
+    dpdk-performance-changes-3n-skx-cmp:
+      csit-dpdk-perf-verify-1901-3n-skx:
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+    dpdk-performance-changes-3n-skx:
+      - "dpdk-performance-changes-3n-skx-h1"
+      - "dpdk-performance-changes-3n-skx-ref"
+      - "dpdk-performance-changes-3n-skx-cmp"
+
+    dpdk-performance-changes-2n-skx-ref:
+      csit-dpdk-perf-verify-1810-2n-skx:
+        - 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
+        - 13  # NDRPDR sel
+    dpdk-performance-changes-2n-skx-cmp:
+      csit-dpdk-perf-verify-1901-2n-skx:
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+    dpdk-performance-changes-2n-skx:
+      - "dpdk-performance-changes-2n-skx-ref"
+      - "dpdk-performance-changes-2n-skx-cmp"
+
+    # Compare testbeds
+
+    vpp-compare-testbeds-ref:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 10  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 44  # NDRPDR sel
+        - 46  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+    vpp-compare-testbeds-cmp:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+    vpp-compare-testbeds:
+      - "vpp-compare-testbeds-ref"
+      - "vpp-compare-testbeds-cmp"
+
+    vpp-compare-testbeds-mrr-ref:
+      csit-vpp-perf-verify-1901-3n-hsw:
+        - 35  # MRR sel
+    vpp-compare-testbeds-mrr-cmp:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 32  # MRR sel
+    vpp-compare-testbeds-mrr:
+      - "vpp-compare-testbeds-mrr-ref"
+      - "vpp-compare-testbeds-mrr-cmp"
+
+    dpdk-compare-testbeds-ref:
+      csit-dpdk-perf-verify-1901-3n-hsw:
+        - 13  # NDRPDR sel
+        - 14  # 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
+    dpdk-compare-testbeds-cmp:
+      csit-dpdk-perf-verify-1901-3n-skx:
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+    dpdk-compare-testbeds:
+      - "dpdk-compare-testbeds-ref"
+      - "dpdk-compare-testbeds-cmp"
+
+    # Compare topologies
+
+    vpp-compare-topologies-ref:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 28  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 33  # NDRPDR sel
+        - 36  # NDRPDR sel
+        - 38  # NDRPDR sel
+        - 47  # NDRPDR sel
+        - 48  # NDRPDR sel
+    vpp-compare-topologies-cmp:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 5   # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 21  # NDRPDR sel
+        - 23  # NDRPDR sel
+        - 31  # NDRPDR sel
+        - 34  # NDRPDR sel
+        - 40  # NDRPDR sel
+        - 42  # NDRPDR sel
+        - 43  # NDRPDR sel
+    vpp-compare-topologies:
+      - "vpp-compare-topologies-ref"
+      - "vpp-compare-topologies-cmp"
+
+    vpp-compare-topologies-mrr-ref:
+      csit-vpp-perf-verify-1901-3n-skx:
+        - 32  # MRR sel
+    vpp-compare-topologies-mrr-cmp:
+      csit-vpp-perf-verify-1901-2n-skx:
+        - 22  # MRR sel
+    vpp-compare-topologies-mrr:
+      - "vpp-compare-topologies-mrr-ref"
+      - "vpp-compare-topologies-mrr-cmp"
+
+    dpdk-compare-topologies-ref:
+      csit-dpdk-perf-verify-1901-3n-skx:
+        - 3   # NDRPDR sel
+        - 5   # NDRPDR sel
+        - 6   # NDRPDR sel
+        - 7   # NDRPDR sel
+        - 8   # NDRPDR sel
+        - 9   # NDRPDR sel
+        - 10  # NDRPDR sel
+        - 11  # NDRPDR sel
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+    dpdk-compare-topologies-cmp:
+      csit-dpdk-perf-verify-1901-2n-skx:
+        - 12  # NDRPDR sel
+        - 13  # NDRPDR sel
+        - 14  # NDRPDR sel
+        - 15  # NDRPDR sel
+        - 16  # NDRPDR sel
+        - 17  # NDRPDR sel
+        - 18  # NDRPDR sel
+        - 19  # NDRPDR sel
+        - 20  # NDRPDR sel
+        - 21  # NDRPDR sel
+    dpdk-compare-topologies:
+      - "dpdk-compare-topologies-ref"
+      - "dpdk-compare-topologies-cmp"
+
+  plot-layouts:
+
+    plot-soak-throughput:
+      titlefont:
+        size: 18
+      xaxis:
+        title: "<b>Test Cases [Index]</b>"
+        titlefont:
           size: 16
         autorange: True
         fixedrange: False
           size: 16
         autorange: True
         fixedrange: False
@@ -1059,7 +927,7 @@
         showgrid: True
         showline: True
         showticklabels: True
         showgrid: True
         showline: True
         showticklabels: True
-        tickcolor: "rgb(238, 238, 238)"
+        tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
         tickfont:
           size: 16
         tickmode: "linear"
         tickfont:
           size: 16
@@ -1068,81 +936,66 @@
         title: "<b>Packet Throughput [Mpps]</b>"
         titlefont:
           size: 16
         title: "<b>Packet Throughput [Mpps]</b>"
         titlefont:
           size: 16
-        type: "linear"
         gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
         gridcolor: "rgb(230, 230, 230)"
         hoverformat: ".4s"
+        tickformat: ".3s"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
         tickcolor: "rgb(220, 220, 220)"
         linecolor: "rgb(220, 220, 220)"
         linewidth: 1
         showgrid: True
         showline: True
         showticklabels: True
         tickcolor: "rgb(220, 220, 220)"
-        tickformat: ".4s"
         tickfont:
           size: 16
         tickfont:
           size: 16
-        zeroline: True
-        rangemode: "tozero"
-        range: [0,100]
+        zeroline: False
+        range: [0,50]
+      autosize: False
+      margin:
+        t: 50
+        b: 0
+        l: 80
+        r: 20
+      showlegend: True
       legend:
         orientation: "h"
         font:
           size: 16
       legend:
         orientation: "h"
         font:
           size: 16
-        xanchor: "left"
-        yanchor: "top"
-        x: 0
-        y: -0.2
-        bgcolor: "rgba(255, 255, 255, 0)"
-        bordercolor: "rgba(255, 255, 255, 0)"
-        traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
-      autosize: False
-      margin:
-          't': 50
-          'b': 150
-          'l': 85
-          'r': 10
-      showlegend: True
       width: 700
       width: 700
-      height: 700
-      hoverlabel:
-        namelength: -1
-      annotations: [
-        {
-          text: "_ _          __          ...",
-          align: "left",
-          showarrow: False,
-          xref: "paper",
-          yref: "paper",
-          xanchor: "left",
-          yanchor: "top",
-          x: 0,
-          y: -0.13,
-          font: {
-            family: "Consolas, Courier New",
-            size: 15
-          },
-        },
-        {
-          text: "    Perfect     Measured     Limit",
-          align: "left",
-          showarrow: False,
-          xref: "paper",
-          yref: "paper",
-          xanchor: "left",
-          yanchor: "top",
-          x: 0,
-          y: -0.15,
-          font: {
-            family: "Consolas, Courier New",
-            size: 15
-          },
-        },
-      ]
+      height: 900
 
 
-    plot-latency:
+    plot-service-density:
       titlefont:
         size: 18
       xaxis:
       titlefont:
         size: 18
       xaxis:
-        title: "<b>Direction</b>"
+        side: "top"
+        autorange: True
+        fixedrange: False
+        showgrid: False
+        showline: False
+        showticklabels: False
+        ticks: ""
+        ticklen: 0
+        tickwidth: 0
+        zeroline: False
+      yaxis:
+        autorange: "reversed"
+        showgrid: False
+        showline: False
+        showticklabels: False
+        ticks: ""
+        ticklen: 0
+        tickwidth: 0
+        zeroline: False
+      autosize: True
+      showlegend: False
+      width: 700
+      height: 700
+
+    plot-cps:
+      titlefont:
+        size: 18
+      xaxis:
+        title: "<b>Test Cases [Index]</b>"
         titlefont:
           size: 16
         autorange: True
         titlefont:
           size: 16
         autorange: True
@@ -1152,14 +1005,173 @@
         linewidth: 1
         showgrid: True
         showline: True
         linewidth: 1
         showgrid: True
         showline: True
-        showticklabels: False
+        showticklabels: True
         tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
         tickfont:
           size: 16
         zeroline: False
       yaxis:
         tickcolor: "rgb(220, 220, 220)"
         tickmode: "linear"
         tickfont:
           size: 16
         zeroline: False
       yaxis:
-        title: "<b>Packet Latency [uSec]</b>"
+        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
+
+    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
+
+    plot-throughput:
+      titlefont:
+        size: 18
+      xaxis:
+        title: "<b>Test Cases [Index]</b>"
+        titlefont:
+          size: 16
+        autorange: True
+        fixedrange: False
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(220, 220, 220)"
+        tickmode: "linear"
+        tickfont:
+          size: 16
+        zeroline: False
+      yaxis:
+        title: "<b>Packet Throughput [Mpps]</b>"
+        titlefont:
+          size: 16
+        gridcolor: "rgb(230, 230, 230)"
+        hoverformat: ".4s"
+        tickformat: ".3s"
+        linecolor: "rgb(220, 220, 220)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(220, 220, 220)"
+        tickfont:
+          size: 16
+        zeroline: False
+        range: [0,50]
+      boxmode: "group"
+      boxgroupgap: 0.5
+      autosize: False
+      margin:
+        t: 50
+        b: 0
+        l: 80
+        r: 20
+      showlegend: True
+      legend:
+        orientation: "h"
+        font:
+          size: 16
+      width: 700
+      height: 900
+
+    plot-throughput-speedup-analysis:
+      titlefont:
+        size: 18
+      xaxis:
+        title: "<b>Number of Cores [Qty]</b>"
+        titlefont:
+          size: 16
+        autorange: True
+        fixedrange: False
+        gridcolor: "rgb(230, 230, 230)"
+        linecolor: "rgb(220, 220, 220)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
+        tickmode: "linear"
+        tickfont:
+          size: 16
+        zeroline: False
+      yaxis:
+        title: "<b>Packet Throughput [Mpps]</b>"
         titlefont:
           size: 16
         type: "linear"
         titlefont:
           size: 16
         type: "linear"
@@ -1176,1224 +1188,232 @@
           size: 16
         zeroline: True
         rangemode: "tozero"
           size: 16
         zeroline: True
         rangemode: "tozero"
+        range: [0,100]
       legend:
         orientation: "h"
         font:
           size: 16
       legend:
         orientation: "h"
         font:
           size: 16
+        xanchor: "left"
+        yanchor: "top"
+        x: 0
+        y: -0.2
+        bgcolor: "rgba(255, 255, 255, 0)"
+        bordercolor: "rgba(255, 255, 255, 0)"
         traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
       autosize: False
       margin:
           't': 50
           'b': 150
         traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
       autosize: False
       margin:
           't': 50
           'b': 150
-          'l': 80
+          'l': 85
           'r': 10
       showlegend: True
       width: 700
       height: 700
       hoverlabel:
         namelength: -1
           'r': 10
       showlegend: True
       width: 700
       height: 700
       hoverlabel:
         namelength: -1
+      annotations: [
+        {
+          text: "_ _          __          ...",
+          align: "left",
+          showarrow: False,
+          xref: "paper",
+          yref: "paper",
+          xanchor: "left",
+          yanchor: "top",
+          x: 0,
+          y: -0.13,
+          font: {
+            family: "Consolas, Courier New",
+            size: 15
+          },
+        },
+        {
+          text: "    Perfect     Measured     Limit",
+          align: "left",
+          showarrow: False,
+          xref: "paper",
+          yref: "paper",
+          xanchor: "left",
+          yanchor: "top",
+          x: 0,
+          y: -0.15,
+          font: {
+            family: "Consolas, Courier New",
+            size: 15
+          },
+        },
+      ]
 
 
--
-  type: "static"
-  src-path: "{DIR[RST]}"
-  dst-path: "{DIR[WORKING,SRC]}"
-
--
-  type: "input"
-  general:
-    file-name: "robot-plugin.zip"
-    file-format: ".zip"
-    download-path: "{job}/{build}/robot/report/*zip*/{filename}"
-    extract: "robot-plugin/output.xml"
-
-  builds:
-
-    # TODO: Replace with 1901 data
-    intel-dnv-vpp-release-1810:
-    - 1
-
-    csit-vpp-perf-verify-1807-3n-hsw:
-    - 8   # MRR full
-    - 9   # MRR sel
-    - 21  # MRR sel
-    - 31  # MRR sel
-    - 33  # MRR sel
-    - 36  # MRR sel
-    - 41  # MRR sel
-    - 42  # MRR sel
-    - 48  # MRR sel
-    - 11  # NDRPDR full 1
-    - 22  # NDRPDR full 2
-    - 45  # NDRPDR full 3
-    - 46  # NDRPDR full 4
-    - 15  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 44  # NDRPDR sel
-    - 47  # NDRPDR sel
-    csit-vpp-perf-verify-1810-3n-hsw:
-    - 9   # MRR sel
-    - 20  # NDRPDR full
-    - 21  # NDRPDR full
-    - 22  # NDRPDR full
-    - 27  # NDRPDR full
-    - 8   # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 23  # NDRPDR sel
-    - 25  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 39  # NDRPDR sel
-    - 41  # NDRPDR sel
-    - 42  # NDRPDR sel
-    - 28  # WRK
-    - 29  # WRK
-    - 30  # WRK
-    - 31  # WRK
-    - 32  # WRK
-    - 33  # WRK
-    - 34  # WRK
-    - 35  # WRK
-    - 36  # WRK
-    - 37  # WRK
-    csit-vpp-perf-verify-1901-3n-hsw:
-    - 35  # MRR sel
-    - 38  # NDRPDR full
-    - 43  # NDRPDR full
-    - 10  # NDRPDR sel
-    - 18  # NDRPDR sel F
-    - 19  # NDRPDR sel
-    - 31  # NDRPDR sel
-    - 36  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 42  # NDRPDR sel
-    csit-vpp-perf-verify-1807-3n-skx:
-    - 31  # MRR full
-    - 28  # MRR sel
-    - 32  # MRR sel
-    - 36  # MRR sel
-    - 42  # MRR sel
-    - 47  # MRR sel
-    - 48  # MRR sel
-    - 51  # MRR sel
-    - 52  # MRR sel
-    - 53  # MRR sel
-    - 54  # MRR sel
-    - 40  # NDRPDR full 1
-    - 41  # NDRPDR full 2
-    - 33  # NDRPDR sel
-    - 35  # NDRPDR sel
-    - 37  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 39  # NDRPDR sel
-    - 43  # NDRPDR sel
-    - 44  # NDRPDR sel
-    - 49  # NDRPDR sel
-    - 50  # NDRPDR sel
-    - 56  # NDRPDR sel
-    csit-vpp-perf-verify-1810-3n-skx:
-    - 9   # MRR sel
-    - 11  # MRR sel
-    - 12  # MRR sel
-    - 13  # MRR sel
-    - 23  # NDRPDR full
-    - 24  # NDRPDR full
-    - 10  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 15  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 17  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 22  # NDRPDR sel
-    - 25  # NDRPDR sel
-    csit-vpp-perf-verify-1901-3n-skx:
-    - 32  # MRR sel
-    - 37  # NDRPDR full
-    - 39  # NDRPDR full
-    - 40  # NDRPDR full
-    - 49  # NDRPDR full
-    - 18  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 28  # NDRPDR sel
-    - 31  # NDRPDR sel
-    - 33  # NDRPDR sel
-    - 36  # NDRPDR sel
-    - 38  # NDRPDR sel
-    - 47  # NDRPDR sel
-    - 48  # NDRPDR sel
-    csit-vpp-perf-verify-1807-2n-skx:
-    - 27  # MRR full
-    - 31  # MRR sel
-    - 33  # MRR sel
-    - 37  # MRR sel
-    - 38  # MRR sel
-    - 41  # MRR sel
-    - 43  # MRR sel
-    - 44  # MRR sel
-    - 45  # MRR sel
-    - 46  # MRR sel
-    - 47  # MRR sel
-    - 32  # NDRPDR full
-    - 26  # NDRPDR sel
-    - 28  # NDRPDR sel
-    - 29  # NDRPDR sel
-    - 30  # NDRPDR sel
-    - 34  # NDRPDR sel
-    - 35  # NDRPDR sel
-    - 36  # NDRPDR sel
-    - 39  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 42  # NDRPDR sel
-    csit-vpp-perf-verify-1810-2n-skx:
-    - 8   # MRR sel
-    - 10  # MRR sel
-    - 11  # MRR sel
-    - 12  # MRR sel
-    - 25  # NDRPDR full
-    - 26  # NDRPDR full
-    - 9   # NDRPDR sel
-    - 13  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 22  # NDRPDR sel
-    - 23  # NDRPDR sel
-    - 24  # NDRPDR sel
-    - 27  # NDRPDR sel
-    csit-vpp-perf-verify-1901-2n-skx:
-    - 22  # MRR sel
-    - 25  # NDRPDR full
-    - 30  # NDRPDR full
-    - 33  # NDRPDR full
-    - 5   # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 23  # NDRPDR sel
-    - 31  # NDRPDR sel
-    - 34  # NDRPDR sel
-    - 40  # NDRPDR sel
-    - 42  # NDRPDR sel
-    - 43  # NDRPDR sel
-    - 24  # NFV MRR
-    - 26  # NFV MRR
-    - 27  # NFV MRR
-    - 35  # NFV MRR
-    - 37  # NFV MRR
-    - 28  # NFV NDRPDR
-    - 29  # NFV NDRPDR
-    - 32  # NFV NDRPDR
-    - 39  # NFV NDRPDR
-    - 45  # SOAK
-    csit-ligato-perf-verify-1810-3n-hsw:
-    - 5   # full
-    - 6   # sel
-    - 8   # sel
-    - 9   # sel
-    - 11  # sel
-    - 12  # sel
-    - 13  # sel
-    - 14  # sel
-    - 16  # sel
-    - 17  # sel
-    - 18  # sel
-    # TODO: Add new data
-    # csit-ligato-perf-verify-1901-3n-hsw:
-    csit-dpdk-perf-verify-1807-3n-hsw:
-    - 11
-    - 12  # full
-    - 14
-    - 15
-    - 16
-    - 17
-    - 20
-    - 21
-    - 22
-    - 23
-    csit-dpdk-perf-verify-1810-3n-hsw:
-    - 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-1901-3n-hsw:
-    - 13  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 17  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
-    - 22  # NDRPDR sel
-    csit-dpdk-perf-verify-1807-3n-skx:
-    - 1   # NDRPDR sel
-    - 2   # NDRPDR sel
-    - 3   # 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-1810-3n-skx:
-    - 3   # NDRPDR sel
-    - 4   # 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
-    csit-dpdk-perf-verify-1901-3n-skx:
-    - 3   # NDRPDR sel
-    - 5   # NDRPDR sel
-    - 6   # NDRPDR sel
-    - 7   # NDRPDR sel
-    - 8   # NDRPDR sel
-    - 9   # NDRPDR sel
-    - 10  # NDRPDR sel
-    - 11  # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
-    csit-dpdk-perf-verify-1810-2n-skx:
-    - 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
-    - 13  # NDRPDR sel
-    csit-dpdk-perf-verify-1901-2n-skx:
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
-    - 14  # NDRPDR sel
-    - 15  # NDRPDR sel
-    - 16  # NDRPDR sel
-    - 17  # NDRPDR sel
-    - 18  # NDRPDR sel
-    - 19  # NDRPDR sel
-    - 20  # NDRPDR sel
-    - 21  # NDRPDR sel
-    csit-vpp-functional-1901-ubuntu1604-virl:
-    - 48
-    csit-vpp-functional-1901-centos7-virl:
-    - 50
-    csit-vpp-device-1901-ubuntu1804-1n-skx:
-    - 49
-    # TODO: Replace with 1901 data
-    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
-    - 1
-    csit-dmm-functional-1901-ubuntu1604-virl:
-    - 2
-    csit-hc2vpp-verify-func-1901-ubuntu1604:
-    - 3
-
--
-  type: "output"
-  output: "report"
-  format:
-    html:
-    - full
-    pdf:
-    - minimal
-
-################################################################################
-###                               T A B L E S                                ###
-################################################################################
-
-
-# VPP Compare NICs 3n-hsw 1t1c ndr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-hsw 1t1c ndr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-ndr"
-  reference:
-    title: "Intel-x520"
-    nic: "NIC_Intel-X520-DA2"
-  compare:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  data: "vpp-nic-comparison-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 3n-hsw 2t2c ndr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-hsw 2t2c ndr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-ndr"
-  reference:
-    title: "Intel-x520"
-    nic: "NIC_Intel-X520-DA2"
-  compare:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  data: "vpp-nic-comparison-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 3n-hsw 1t1c pdr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-hsw 1t1c pdr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-pdr"
-  reference:
-    title: "Intel-x520"
-    nic: "NIC_Intel-X520-DA2"
-  compare:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  data: "vpp-nic-comparison-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 3n-hsw 2t2c pdr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-hsw 2t2c pdr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-pdr"
-  reference:
-    title: "Intel-x520"
-    nic: "NIC_Intel-X520-DA2"
-  compare:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  data: "vpp-nic-comparison-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 3n-hsw 1t1c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-hsw 1t1c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-mrr"
-  reference:
-    title: "Intel-x520"
-    nic: "NIC_Intel-X520-DA2"
-  compare:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  data: "vpp-nic-comparison-3n-hsw-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
-# VPP Compare NICs 3n-hsw 2t2c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-hsw 2t2c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-mrr"
-  reference:
-    title: "Intel-x520"
-    nic: "NIC_Intel-X520-DA2"
-  compare:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  data: "vpp-nic-comparison-3n-hsw-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
-# VPP Compare NICs 3n-hsw 4t4c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-hsw 4t4c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-nics-mrr"
-  reference:
-    title: "Intel-x520"
-    nic: "NIC_Intel-X520-DA2"
-  compare:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  data: "vpp-nic-comparison-3n-hsw-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
-# VPP Compare NICs 3n-skx 2t1c ndr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c ndr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-3n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 3n-skx 4t2c ndr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c ndr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-3n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 3n-skx 2t1c pdr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c pdr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
- # VPP Compare NICs 3n-skx 4t2c pdr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c pdr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 3n-skx 2t1c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-skx 2t1c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
-# VPP Compare NICs 3n-skx 4t2c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-skx 4t2c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
- # VPP Compare NICs 3n-skx 8t4c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 3n-skx 8t4c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
-# VPP Compare NICs 2n-skx 2t1c ndr
--
-  type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c ndr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 2n-skx 4t2c ndr
--
-  type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c ndr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
- # VPP Compare NICs 2n-skx 2t1c pdr
--
-  type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c pdr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-2n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 2n-skx 4t2c pdr
--
-  type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c pdr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-2n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-  - "tags"
-
-# VPP Compare NICs 2n-skx 2t1c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 2n-skx 2t1c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-2n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
-# VPP Compare NICs 2n-skx 4t2c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 2n-skx 4t2c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-2n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
-# VPP Compare NICs 2n-skx 8t4c mrr
--
-  type: "table"
-  title: "VPP Compare NICs 2n-skx 8t4c mrr"
-  algorithm: "table_nics_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
-  reference:
-    title: "Intel-x710"
-    nic: "NIC_Intel-X710"
-  compare:
-    title: "Intel-xxv710"
-    nic: "NIC_Intel-XXV710"
-  data: "vpp-nic-comparison-2n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-  - "tags"
-
-################################################################################
-# VPP
-
-# VPP Performance Changes 3n-hsw 1t1c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 3n-hsw 2t2c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 47  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+    plot-latency:
+      titlefont:
+        size: 18
+      xaxis:
+        title: "<b>Direction</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: False
+        tickcolor: "rgb(220, 220, 220)"
+        tickmode: "linear"
+        tickfont:
+          size: 16
+        zeroline: False
+      yaxis:
+        title: "<b>Packet Latency [uSec]</b>"
+        titlefont:
+          size: 16
+        type: "linear"
+        gridcolor: "rgb(230, 230, 230)"
+        hoverformat: ".4s"
+        linecolor: "rgb(220, 220, 220)"
+        linewidth: 1
+        showgrid: True
+        showline: True
+        showticklabels: True
+        tickcolor: "rgb(220, 220, 220)"
+        tickformat: ".4s"
+        tickfont:
+          size: 16
+        zeroline: True
+        rangemode: "tozero"
+      legend:
+        orientation: "h"
+        font:
+          size: 16
+        traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
+      autosize: False
+      margin:
+          't': 50
+          'b': 150
+          'l': 80
+          'r': 10
+      showlegend: True
+      width: 700
+      height: 700
+      hoverlabel:
+        namelength: -1
 
 
-# VPP Performance Changes 3n-hsw 1t1c ndr
 -
 -
-  type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 47  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+  type: "static"
+  src-path: "{DIR[RST]}"
+  dst-path: "{DIR[WORKING,SRC]}"
 
 
-# VPP Performance Changes 3n-hsw 2t2c ndr
 -
 -
-  type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 11  # NDRPDR full 1
-        - 22  # NDRPDR full 2
-        - 45  # NDRPDR full 3
-        - 46  # NDRPDR full 4
-        - 15  # NDRPDR sel
-        - 16  # NDRPDR sel
-        - 19  # NDRPDR sel
-        - 18  # NDRPDR sel
-        - 20  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 47  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+  type: "input"
+  general:
+    file-name: "robot-plugin.zip"
+    file-format: ".zip"
+    download-path: "{job}/{build}/robot/report/*zip*/{filename}"
+    extract: "robot-plugin/output.xml"
 
 
-# VPP Performance Changes 3n-skx 2t1c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-skx:
-        - 33  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 49  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 56  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-  data: "vpp-performance-changes-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+  builds:
 
 
-# VPP Performance Changes 3n-skx 4t2c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-skx:
-        - 33  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 49  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 56  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-  data: "vpp-performance-changes-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+    # Not used
+    intel-dnv-vpp-release-1810:
+      - 1
 
 
-# VPP Performance Changes 3n-skx 2t1c ndr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-skx:
-        - 33  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 49  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 56  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
+    csit-vpp-perf-verify-1807-3n-hsw:
+      - 8   # MRR full
+      - 9   # MRR sel
+      - 21  # MRR sel
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 36  # MRR sel
+      - 41  # MRR sel
+      - 42  # MRR sel
+      - 48  # MRR sel
+      - 11  # NDRPDR full 1
+      - 22  # NDRPDR full 2
+      - 45  # NDRPDR full 3
+      - 46  # NDRPDR full 4
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
       - 15  # NDRPDR sel
       - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
       - 19  # NDRPDR sel
       - 19  # NDRPDR sel
+      - 18  # NDRPDR sel
       - 20  # NDRPDR sel
       - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
+      - 38  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 47  # NDRPDR sel
+    csit-vpp-perf-verify-1810-3n-hsw:
+      - 9   # MRR sel
+      - 20  # NDRPDR full
+      - 21  # NDRPDR full
+      - 22  # NDRPDR full
+      - 27  # NDRPDR full
+      - 8   # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
       - 18  # NDRPDR sel
       - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 28  # WRK
+      - 29  # WRK
+      - 30  # WRK
+      - 31  # WRK
+      - 32  # WRK
+      - 33  # WRK
+      - 34  # WRK
+      - 35  # WRK
+      - 36  # WRK
+      - 37  # WRK
+    csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+      - 38  # NDRPDR full
+      - 43  # NDRPDR full
+      - 45  # NDRPDR full
+      - 49  # NDRPDR full
+      - 10  # NDRPDR sel
       - 19  # NDRPDR sel
       - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
       - 31  # NDRPDR sel
       - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
       - 36  # NDRPDR sel
       - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 46  # NDRPDR sel
       - 47  # NDRPDR sel
       - 48  # NDRPDR sel
       - 47  # NDRPDR sel
       - 48  # NDRPDR sel
-  data: "vpp-performance-changes-3n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 3n-skx 4t2c ndr
--
-  type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-skx:
-        - 33  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 37  # NDRPDR sel
-        - 38  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 43  # NDRPDR sel
-        - 44  # NDRPDR sel
-        - 49  # NDRPDR sel
-        - 50  # NDRPDR sel
-        - 56  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
+    csit-vpp-perf-verify-1807-3n-skx:
+      - 31  # MRR full
+      - 28  # MRR sel
+      - 32  # MRR sel
+      - 36  # MRR sel
+      - 42  # MRR sel
+      - 47  # MRR sel
+      - 48  # MRR sel
+      - 51  # MRR sel
+      - 52  # MRR sel
+      - 53  # MRR sel
+      - 54  # MRR sel
+      - 40  # NDRPDR full 1
+      - 41  # NDRPDR full 2
+      - 33  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 37  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 43  # NDRPDR sel
+      - 44  # NDRPDR sel
+      - 49  # NDRPDR sel
+      - 50  # NDRPDR sel
+      - 56  # NDRPDR sel
+    csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+      - 23  # NDRPDR full
+      - 24  # NDRPDR full
       - 10  # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
       - 10  # NDRPDR sel
       - 14  # NDRPDR sel
       - 15  # NDRPDR sel
@@ -2404,10 +1424,12 @@
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
+    csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
+      - 37  # NDRPDR full
+      - 39  # NDRPDR full
+      - 40  # NDRPDR full
+      - 49  # NDRPDR full
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
@@ -2418,151 +1440,36 @@
       - 38  # NDRPDR sel
       - 47  # NDRPDR sel
       - 48  # NDRPDR sel
       - 38  # NDRPDR sel
       - 47  # NDRPDR sel
       - 48  # NDRPDR sel
-  data: "vpp-performance-changes-3n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2n-skx 2t1c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 26  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 42  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-  data: "vpp-performance-changes-2n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2n-skx 4t2c pdr
--
-  type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
-  history:
-    - title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 26  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 42  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-  data: "vpp-performance-changes-2n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2n-skx 2t1c ndr
--
-  type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
-  history:
-    - title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 26  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 42  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
+    csit-vpp-perf-verify-1807-2n-skx:
+      - 27  # MRR full
+      - 31  # MRR sel
+      - 33  # MRR sel
+      - 37  # MRR sel
+      - 38  # MRR sel
+      - 41  # MRR sel
+      - 43  # MRR sel
+      - 44  # MRR sel
+      - 45  # MRR sel
+      - 46  # MRR sel
+      - 47  # MRR sel
+      - 32  # NDRPDR full
+      - 26  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 29  # NDRPDR sel
+      - 30  # NDRPDR sel
+      - 34  # NDRPDR sel
+      - 35  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 40  # NDRPDR sel
+      - 42  # NDRPDR sel
+    csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 25  # NDRPDR full
+      - 26  # NDRPDR full
       - 9   # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
       - 9   # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
@@ -2573,10 +1480,12 @@
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
       - 27  # NDRPDR sel
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
       - 27  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
+    csit-vpp-perf-verify-1901-2n-skx:
+      - 22  # MRR sel
+      - 25  # NDRPDR full
+      - 30  # NDRPDR full
+      - 33  # NDRPDR full
+      - 44  # NDRPDR full
       - 5   # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
       - 5   # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
@@ -2587,2351 +1496,1707 @@
       - 40  # NDRPDR sel
       - 42  # NDRPDR sel
       - 43  # NDRPDR sel
       - 40  # NDRPDR sel
       - 42  # NDRPDR sel
       - 43  # NDRPDR sel
-  data: "vpp-performance-changes-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Performance Changes 2n-skx 4t2c ndr
--
-  type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
-  history:
-    - title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 26  # NDRPDR sel
-        - 28  # NDRPDR sel
-        - 29  # NDRPDR sel
-        - 30  # NDRPDR sel
-        - 34  # NDRPDR sel
-        - 35  # NDRPDR sel
-        - 36  # NDRPDR sel
-        - 39  # NDRPDR sel
-        - 40  # NDRPDR sel
-        - 42  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
+      - 24  # NFV MRR
+      - 26  # NFV MRR
+      - 27  # NFV MRR
+      - 35  # NFV MRR
+      - 37  # NFV MRR
+      - 28  # NFV NDRPDR
+      - 29  # NFV NDRPDR
+      - 32  # NFV NDRPDR
+      - 39  # NFV NDRPDR
+      - 46  # NFV NDRPDR
+      - 45  # SOAK
+    # TODO: Add new data
+    csit-ligato-perf-verify-1901-3n-hsw:
+      - 10  # NDRPDR full
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 15  # NDRPDR sel
+      - 16  # NDRPDR sel
+      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel
+    csit-dpdk-perf-verify-1807-3n-hsw:
+      - 11
+      - 12  # full
+      - 14
+      - 15
+      - 16
+      - 17
+      - 20
+      - 21
+      - 22
+      - 23
+    csit-dpdk-perf-verify-1810-3n-hsw:
+      - 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
       - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+    csit-dpdk-perf-verify-1901-3n-hsw:
       - 13  # NDRPDR sel
       - 14  # NDRPDR sel
       - 13  # NDRPDR sel
       - 14  # 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
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
+    csit-dpdk-perf-verify-1807-3n-skx:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-  data: "vpp-performance-changes-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
--
-  type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
-  reference:
-    title: "3-Node Hsw"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
+    csit-dpdk-perf-verify-1810-3n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
       - 10  # NDRPDR sel
       - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
--
-  type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
-  reference:
-    title: "3-Node Hsw"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1901-3n-skx:
+      - 3   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
       - 10  # NDRPDR sel
       - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
-
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
--
-  type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
-  reference:
-    title: "3-Node Hsw"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1810-2n-skx:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
       - 10  # NDRPDR sel
       - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
+      - 11  # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+    csit-dpdk-perf-verify-1901-2n-skx:
+      - 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
       - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+      - 21  # NDRPDR sel
+    csit-vpp-functional-1901-ubuntu1604-virl:
+      - 48
+    csit-vpp-functional-1901-centos7-virl:
+      - 50
+    csit-vpp-device-1901-ubuntu1804-1n-skx:
+      - 49
+    # Not used
+    csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
+      - 1
+    csit-dmm-functional-1901-ubuntu1604-virl:
+      - 2
+    csit-hc2vpp-verify-func-1901-ubuntu1604:
+      - 3
 
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
 -
 -
-  type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
-  reference:
-    title: "3-Node Hsw"
-    data:
-      # TODO: Add new data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 10  # NDRPDR sel
-      - 18  # NDRPDR sel F
-      - 19  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "throughput"
+  type: "output"
+  output: "report"
+  format:
+    html:
+    - full
+#    pdf:
+#    - minimal
 
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
+################################################################################
+###                               T A B L E S                                ###
+################################################################################
+
+# VPP Compare NICs 3n-hsw 1t1c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
+  title: "VPP Compare NICs 3n-hsw 1t1c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-ndr"
   reference:
   reference:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
   compare:
-    title: "2-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-  data: "vpp-compare-topologies"
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '1C'"
+  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
+# VPP Compare NICs 3n-hsw 2t2c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
+  title: "VPP Compare NICs 3n-hsw 2t2c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-ndr"
   reference:
   reference:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
   compare:
-    title: "2-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-  data: "vpp-compare-topologies"
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '2C'"
+  filter: "'2T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
+# VPP Compare NICs 3n-hsw 1t1c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
+  title: "VPP Compare NICs 3n-hsw 1t1c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-pdr"
   reference:
   reference:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
   compare:
-    title: "2-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-  data: "vpp-compare-topologies"
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '1C'"
+  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
+# VPP Compare NICs 3n-hsw 2t2c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
+  title: "VPP Compare NICs 3n-hsw 2t2c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-pdr"
   reference:
   reference:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 28  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 33  # NDRPDR sel
-      - 36  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 47  # NDRPDR sel
-      - 48  # NDRPDR sel
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
   compare:
-    title: "2-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 5   # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 31  # NDRPDR sel
-      - 34  # NDRPDR sel
-      - 40  # NDRPDR sel
-      - 42  # NDRPDR sel
-      - 43  # NDRPDR sel
-  data: "vpp-compare-topologies"
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR' and '2C'"
+  filter: "'2T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
 
-# VPP Performance Changes 3n-hsw 1t1c MRR
+# VPP Compare NICs 3n-hsw 1t1c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 8   # MRR full
-        - 9   # MRR sel
-        - 21  # MRR sel
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 36  # MRR sel
-        - 41  # MRR sel
-        - 42  # MRR sel
-        - 48  # MRR sel
+  title: "VPP Compare NICs 3n-hsw 1t1c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-nics-mrr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
-  data: "vpp-performance-changes-3n-hsw-mrr"
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
+  - "tags"
 
 
-# VPP Performance Changes 3n-hsw 2t2c MRR
+# VPP Compare NICs 3n-hsw 2t2c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 8   # MRR full
-        - 9   # MRR sel
-        - 21  # MRR sel
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 36  # MRR sel
-        - 41  # MRR sel
-        - 42  # MRR sel
-        - 48  # MRR sel
+  title: "VPP Compare NICs 3n-hsw 2t2c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-nics-mrr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
-  data: "vpp-performance-changes-3n-hsw-mrr"
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
+  - "tags"
 
 
-# VPP Performance Changes 3n-hsw 4t4c MRR
+# VPP Compare NICs 3n-hsw 4t4c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 3n-hsw 4t4c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-hsw:
-        - 8   # MRR full
-        - 9   # MRR sel
-        - 21  # MRR sel
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 36  # MRR sel
-        - 41  # MRR sel
-        - 42  # MRR sel
-        - 48  # MRR sel
+  title: "VPP Compare NICs 3n-hsw 4t4c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-nics-mrr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
-  data: "vpp-performance-changes-3n-hsw-mrr"
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  data: "vpp-nic-comparison-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
+  - "tags"
 
 
-# VPP Performance Changes 3n-skx 2t1c MRR
+# VPP Compare NICs 3n-skx 2t1c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-skx:
-        - 28  # MRR sel
-        - 32  # MRR sel
-        - 36  # MRR sel
-        - 42  # MRR sel
-        - 47  # MRR sel
-        - 48  # MRR sel
-        - 51  # MRR sel
-        - 52  # MRR sel
-        - 53  # MRR sel
+  title: "VPP Compare NICs 3n-skx 2t1c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-ndr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-  data: "vpp-performance-changes-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
+  - "tags"
 
 
-# VPP Performance Changes 3n-skx 4t2c MRR
+# VPP Compare NICs 3n-skx 4t2c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-skx:
-        - 28  # MRR sel
-        - 32  # MRR sel
-        - 36  # MRR sel
-        - 42  # MRR sel
-        - 47  # MRR sel
-        - 48  # MRR sel
-        - 51  # MRR sel
-        - 52  # MRR sel
-        - 53  # MRR sel
+  title: "VPP Compare NICs 3n-skx 4t2c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-ndr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-  data: "vpp-performance-changes-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
+  - "tags"
 
 
-# VPP Performance Changes 3n-skx 8t4c MRR
+# VPP Compare NICs 3n-skx 2t1c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 8t4c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-3n-skx:
-        - 28  # MRR sel
-        - 32  # MRR sel
-        - 36  # MRR sel
-        - 42  # MRR sel
-        - 47  # MRR sel
-        - 48  # MRR sel
-        - 51  # MRR sel
-        - 52  # MRR sel
-        - 53  # MRR sel
+  title: "VPP Compare NICs 3n-skx 2t1c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-pdr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-  data: "vpp-performance-changes-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
+  - "tags"
 
 
-# VPP Performance Changes 2n-skx 2t1c MRR
+ # VPP Compare NICs 3n-skx 4t2c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 37  # MRR sel
-        - 38  # MRR sel
-        - 41  # MRR sel
-        - 43  # MRR sel
-        - 44  # MRR sel
-        - 45  # MRR sel
-        - 46  # MRR sel
-        - 47  # MRR sel
+  title: "VPP Compare NICs 3n-skx 4t2c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-pdr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+  - "tags"
+
+# VPP Compare NICs 3n-skx 2t1c mrr
+-
+  type: "table"
+  title: "VPP Compare NICs 3n-skx 2t1c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-nics-mrr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      # TODO: Add new data
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-  data: "vpp-performance-changes-2n-skx-mrr"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
+  - "tags"
 
 
-# VPP Performance Changes 2n-skx 4t2c MRR
+# VPP Compare NICs 3n-skx 4t2c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 37  # MRR sel
-        - 38  # MRR sel
-        - 41  # MRR sel
-        - 43  # MRR sel
-        - 44  # MRR sel
-        - 45  # MRR sel
-        - 46  # MRR sel
-        - 47  # MRR sel
+  title: "VPP Compare NICs 3n-skx 4t2c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-nics-mrr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-  data: "vpp-performance-changes-2n-skx-mrr"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
+  - "tags"
 
 
-# VPP Performance Changes 2n-skx 8t4c MRR
+ # VPP Compare NICs 3n-skx 8t4c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Performance Changes 2n-skx 8t4c MRR"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-vpp-perf-verify-1807-2n-skx:
-        - 31  # MRR sel
-        - 33  # MRR sel
-        - 37  # MRR sel
-        - 38  # MRR sel
-        - 41  # MRR sel
-        - 43  # MRR sel
-        - 44  # MRR sel
-        - 45  # MRR sel
-        - 46  # MRR sel
-        - 47  # MRR sel
+  title: "VPP Compare NICs 3n-skx 8t4c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-nics-mrr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-  data: "vpp-performance-changes-2n-skx-mrr"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
+  - "tags"
 
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
+# VPP Compare NICs 2n-skx 2t1c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-mrr"
+  title: "VPP Compare NICs 2n-skx 2t1c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-ndr"
   reference:
   reference:
-    title: "3-Node Hsw"
-    data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-  data: "vpp-compare-testbeds-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'MRR' and '1C'"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
+  - "tags"
 
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr
+# VPP Compare NICs 2n-skx 4t2c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-mrr"
+  title: "VPP Compare NICs 2n-skx 4t2c ndr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-ndr"
   reference:
   reference:
-    title: "3-Node Hsw"
-    data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-  data: "vpp-compare-testbeds-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'MRR' and '2C'"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
+  - "tags"
 
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr
+ # VPP Compare NICs 2n-skx 2t1c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-4c-mrr"
+  title: "VPP Compare NICs 2n-skx 2t1c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-pdr"
   reference:
   reference:
-    title: "3-Node Hsw"
-    data:
-      csit-vpp-perf-verify-1901-3n-hsw:
-      - 35  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
-  data: "vpp-compare-testbeds-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'MRR' and '4C'"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
+  - "tags"
 
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr
+# VPP Compare NICs 2n-skx 4t2c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-mrr"
+  title: "VPP Compare NICs 2n-skx 4t2c pdr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-pdr"
   reference:
   reference:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "2-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-  data: "vpp-compare-topologies-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'MRR' and '1C'"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
+  - "tags"
 
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr
+# VPP Compare NICs 2n-skx 2t1c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-mrr"
+  title: "VPP Compare NICs 2n-skx 2t1c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-nics-mrr"
   reference:
   reference:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "2-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-  data: "vpp-compare-topologies-mrr"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'MRR' and '2C'"
+  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "result"
   parameters:
   - "name"
   - "parent"
   - "result"
+  - "tags"
 
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr
+# VPP Compare NICs 2n-skx 4t2c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-4c-mrr"
+  title: "VPP Compare NICs 2n-skx 4t2c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-nics-mrr"
   reference:
   reference:
-    title: "3-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-3n-skx:
-      - 32  # MRR sel
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
   compare:
-    title: "2-Node Skx"
-    data:
-      csit-vpp-perf-verify-1901-2n-skx:
-      - 22  # MRR sel
-  data: "vpp-compare-topologies-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'MRR' and '4C'"
-  parameters:
-  - "name"
-  - "parent"
-  - "result"
-
-# Detailed Test Results - VPP Performance Results 3n-hsw
--
-  type: "table"
-  title: "Detailed Test Results - VPP Performance Results 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "result"
+  - "tags"
 
 
-# Detailed Test Results - VPP Performance Results 3n-skx
+# VPP Compare NICs 2n-skx 8t4c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP Performance Results 3n-skx"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  title: "VPP Compare NICs 2n-skx 8t4c mrr"
+  algorithm: "table_nics_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-nics-mrr"
+  reference:
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
+  compare:
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "result"
+  - "tags"
 
 
-# Detailed Test Results - VPP Performance Results 2n-skx
+################################################################################
+# VPP
+
+# VPP Performance Changes 3n-hsw 1t1c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP Performance Results 2n-skx"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  title: "VPP Performance Changes 3n-hsw 1t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
 
-# Detailed Test Results - VPP Performance Results 2n-dnv
+# VPP Performance Changes 3n-hsw 2t2c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
+  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
 
-# Test configuration - VPP Performance Test Configs 3n-hsw
+# VPP Performance Changes 3n-hsw 1t1c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "throughput"
 
 
-# Test configuration - VPP Performance Test Configs 3n-skx
+# VPP Performance Changes 3n-hsw 2t2c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP Performance Test Configs 3n-skx"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-cmp"
+  data: "vpp-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "throughput"
 
 
-# Test configuration - VPP Performance Test Configs 2n-skx
+# VPP Performance Changes 3n-skx 2t1c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP Performance Test Configs 2n-skx"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  title: "VPP Performance Changes 3n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "throughput"
 
 
-# Test configuration - VPP Performance Test Configs 2n-dnv
+# VPP Performance Changes 3n-skx 4t2c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
+  title: "VPP Performance Changes 3n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "throughput"
 
 
-# Test Operational Data - VPP Performance Operational Data 3n-hsw
+# VPP Performance Changes 3n-skx 2t1c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-    data: "data show-run"
-  rows: "generated"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  title: "VPP Performance Changes 3n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "show-run"
+  - "parent"
+  - "throughput"
 
 
-# Test Operational Data - VPP Performance Operational Data 3n-skx
+# VPP Performance Changes 3n-skx 4t2c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_test_operational_3n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-    data: "data show-run"
-  rows: "generated"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  title: "VPP Performance Changes 3n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-cmp"
+  data: "vpp-performance-changes-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "show-run"
+  - "parent"
+  - "throughput"
 
 
-# Test Operational Data - VPP Performance Operational Data 2n-skx
+# VPP Performance Changes 2n-skx 2t1c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
-  algorithm: "table_merged_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_test_operational_2n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-    data: "data show-run"
-  rows: "generated"
-  data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  title: "VPP Performance Changes 2n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-2n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-2n-skx-cmp"
+  data: "vpp-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "show-run"
+  - "parent"
+  - "throughput"
 
 
-# Test Operational Data - VPP Performance Operational Data 2n-dnv
+# VPP Performance Changes 2n-skx 4t2c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
-    data: "data show-run"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
+  title: "VPP Performance Changes 2n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-pdr"
+  history:
+    - title: "rls1807"
+      data: "vpp-performance-changes-2n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-2n-skx-cmp"
+  data: "vpp-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "show-run"
+  - "parent"
+  - "throughput"
 
 
-# Detailed Test Results - VPP MRR Results 3n-hsw
+# VPP Performance Changes 2n-skx 2t1c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP MRR Results 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
+  title: "VPP Performance Changes 2n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-ndr"
+  history:
+    - title: "rls1807"
+      data: "vpp-performance-changes-2n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-2n-skx-cmp"
+  data: "vpp-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
 
-# Detailed Test Results - VPP MRR Results 3n-skx
+# VPP Performance Changes 2n-skx 4t2c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP MRR Results 3n-skx"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-mrr-results-3n-skx"
-  filter: "'MRR'"
+  title: "VPP Performance Changes 2n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-ndr"
+  history:
+    - title: "rls1807"
+      data: "vpp-performance-changes-2n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-2n-skx-cmp"
+  data: "vpp-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
 
-# Detailed Test Results - VPP MRR Results 2n-skx
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP MRR Results 2n-skx"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "vpp-mrr-results-2n-skx"
-  filter: "'MRR'"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
 
-# Detailed Test Results - VPP MRR Results 2n-dnv
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
 
-# Test configuration - VPP MRR Test Configs 3n-hsw
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP MRR Test Configs 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "throughput"
 
 
-# Test configuration - VPP MRR Test Configs 3n-skx
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP MRR Test Configs 3n-skx"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-mrr-results-3n-skx"
-  filter: "'MRR'"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-cmp"
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "throughput"
 
 
-# Test configuration - VPP MRR Test Configs 2n-skx
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP MRR Test Configs 2n-skx"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-mrr-results-2n-skx"
-  filter: "'MRR'"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
+  reference:
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-cmp"
+  data: "vpp-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '1C'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "throughput"
 
 
-# Test configuration - VPP MRR Test Configs 2n-dnv
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-ndr"
+  reference:
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-cmp"
+  data: "vpp-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '2C'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "throughput"
 
 
-# Detailed Test Results - VPP Functional Results - Ubuntu
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP Functional Results - Ubuntu"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
-  -
-    title: "Status"
-    data: "data status"
-  rows: "generated"
-  data: "vpp-func-results-ubuntu"
-  filter: "all"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-pdr"
+  reference:
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-cmp"
+  data: "vpp-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '1C'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "doc"
-  - "status"
+  - "throughput"
 
 
-# Detailed Test Results - VPP Functional Results - CentOS
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP Functional Results - CentOS"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
-  -
-    title: "Status"
-    data: "data status"
-  rows: "generated"
-  data:
-    "vpp-func-results-centos"
-  filter: "all"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-pdr"
+  reference:
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-cmp"
+  data: "vpp-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '2C'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "doc"
-  - "status"
+  - "throughput"
 
 
-# Test configuration - VPP Functional Test Configs - Ubuntu
+# VPP Performance Changes 3n-hsw 1t1c MRR
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP Functional Test Configs - Ubuntu"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-func-results-ubuntu"
-  filter: "all"
+  title: "VPP Performance Changes 3n-hsw 1t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-hsw-mrr-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-hsw-mrr-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
+  data: "vpp-performance-changes-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "result"
 
 
-# Test configuration - VPP Functional Test Configs - CentOS
+# VPP Performance Changes 3n-hsw 2t2c MRR
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP Functional Test Configs - CentOS"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-func-results-centos"
-  filter: "all"
+  title: "VPP Performance Changes 3n-hsw 2t2c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-hsw-mrr-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-hsw-mrr-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
+  data: "vpp-performance-changes-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "result"
 
 
-# Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
+# VPP Performance Changes 3n-hsw 4t4c MRR
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Status"
-    data: "data msg"
-  rows: "generated"
-  data: "ligato-perf-results-3n-hsw"
-  filter: "all"
+  title: "VPP Performance Changes 3n-hsw 4t4c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-hsw-mrr-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-hsw-mrr-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-hsw-mrr-cmp"
+  data: "vpp-performance-changes-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Performance Changes 3n-skx 2t1c MRR
+-
+  type: "table"
+  title: "VPP Performance Changes 3n-skx 2t1c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-mrr-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-mrr-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-mrr-cmp"
+  data: "vpp-performance-changes-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "result"
 
 
-# Detailed Test Results - VPP Device Results - Ubuntu
+# VPP Performance Changes 3n-skx 4t2c MRR
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - VPP Device Results - Ubuntu"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
-  -
-    title: "Status"
-    data: "data status"
-  rows: "generated"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
+  title: "VPP Performance Changes 3n-skx 4t2c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-mrr-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-mrr-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-mrr-cmp"
+  data: "vpp-performance-changes-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "doc"
-  - "status"
+  - "result"
 
 
-# Test configuration - VPP Device Test Configs - Ubuntu
+# VPP Performance Changes 3n-skx 8t4c MRR
 -
   type: "table"
 -
   type: "table"
-  title: "Test configuration - VPP Device Test Configs - Ubuntu"
-  algorithm: "table_details"
-  output-file-ext: ".csv"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
-  columns:
-  -
-    title: "Name"
-    data: "data name"
-  -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
-  rows: "generated"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
+  title: "VPP Performance Changes 3n-skx 8t4c MRR"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
+  history:
+    -
+      title: "rls1807"
+      data: "vpp-performance-changes-3n-skx-mrr-h1"
+  reference:
+    title: "rls1810"
+    data: "vpp-performance-changes-3n-skx-mrr-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-3n-skx-mrr-cmp"
+  data: "vpp-performance-changes-3n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   parameters:
-  - "parent"
   - "name"
   - "name"
-  - "vat-history"
-
-################################################################################
+  - "parent"
+  - "result"
 
 
-# DPDK Performance Changes 3n-hsw 1t1c pdr
+# VPP Performance Changes 2n-skx 2t1c MRR
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 3n-hsw 1t1c pdr"
+  title: "VPP Performance Changes 2n-skx 2t1c MRR"
   algorithm: "table_performance_comparison"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
   history:
     -
       title: "rls1807"
   history:
     -
       title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
+      data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
     title: "rls1810"
   reference:
     title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 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
+    data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
     title: "rls1901"
   compare:
     title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-  data: "dpdk-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    data: "vpp-performance-changes-2n-skx-mrr-cmp"
+  data: "vpp-performance-changes-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "result"
 
 
-# DPDK Performance Changes 3n-hsw 2t2c pdr
+# VPP Performance Changes 2n-skx 4t2c MRR
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 3n-hsw 2t2c pdr"
+  title: "VPP Performance Changes 2n-skx 4t2c MRR"
   algorithm: "table_performance_comparison"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
   history:
     -
       title: "rls1807"
   history:
     -
       title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
+      data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
     title: "rls1810"
   reference:
     title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 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
+    data: "vpp-performance-changes-2n-skx-mrr-ref"
   compare:
     title: "rls1901"
   compare:
     title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-  data: "dpdk-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    data: "vpp-performance-changes-2n-skx-mrr-cmp"
+  data: "vpp-performance-changes-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "result"
 
 
-# DPDK Performance Changes 3n-hsw 1t1c ndr
+# VPP Performance Changes 2n-skx 8t4c MRR
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 3n-hsw 1t1c ndr"
+  title: "VPP Performance Changes 2n-skx 8t4c MRR"
   algorithm: "table_performance_comparison"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
   history:
     -
       title: "rls1807"
   history:
     -
       title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
+      data: "vpp-performance-changes-2n-skx-mrr-h1"
   reference:
     title: "rls1810"
   reference:
     title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 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
+    data: "vpp-performance-changes-2n-skx-mrr-ref"
+  compare:
+    title: "rls1901"
+    data: "vpp-performance-changes-2n-skx-mrr-cmp"
+  data: "vpp-performance-changes-2n-skx-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-mrr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-mrr-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-mrr-cmp"
+  data: "vpp-compare-testbeds-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'MRR' and '1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-mrr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-mrr-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-mrr-cmp"
+  data: "vpp-compare-testbeds-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'MRR' and '2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr
+-
+  type: "table"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-4c-mrr"
+  reference:
+    title: "3-Node Hsw"
+    data: "vpp-compare-testbeds-mrr-ref"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-  data: "dpdk-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    title: "3-Node Skx"
+    data: "vpp-compare-testbeds-mrr-cmp"
+  data: "vpp-compare-testbeds-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'MRR' and '4C'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "result"
 
 
-# DPDK Performance Changes 3n-hsw 2t2c ndr
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 3n-hsw 2t2c ndr"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr"
   algorithm: "table_performance_comparison"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-hsw:
-        - 11
-        - 12  # full
-        - 14
-        - 15
-        - 16
-        - 17
-        - 20
-        - 21
-        - 22
-        - 23
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-mrr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 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
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-mrr-ref"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-  data: "dpdk-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-mrr-cmp"
+  data: "vpp-compare-topologies-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'MRR' and '1C'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "result"
 
 
-# DPDK Performance Changes 3n-skx 2t1c pdr
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 3n-skx 2t1c pdr"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr"
   algorithm: "table_performance_comparison"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-2c-mrr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # 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
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-mrr-ref"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  data: "dpdk-performance-changes-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-mrr-cmp"
+  data: "vpp-compare-topologies-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'MRR' and '2C'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "result"
 
 
-# DPDK Performance Changes 3n-skx 4t2c pdr
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 3n-skx 4t2c pdr"
+  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr"
   algorithm: "table_performance_comparison"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-4c-mrr"
   reference:
   reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # 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
+    title: "3-Node Skx"
+    data: "vpp-compare-topologies-mrr-ref"
   compare:
   compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  data: "dpdk-performance-changes-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    title: "2-Node Skx"
+    data: "vpp-compare-topologies-mrr-cmp"
+  data: "vpp-compare-topologies-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'MRR' and '4C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# Detailed Test Results - VPP Performance Results 3n-hsw
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Performance Results 3n-hsw"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP Performance Results 3n-skx
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Performance Results 3n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP Performance Results 2n-skx
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-perf-results-2n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP Performance Results 2n-dnv
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "msg"
 
 
-# DPDK Performance Changes 3n-skx 2t1c ndr
+# Test configuration - VPP Performance Test Configs 3n-hsw
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 3n-skx 2t1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # 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
-  compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  data: "dpdk-performance-changes-3n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Test configuration - VPP Performance Test Configs 3n-hsw"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   parameters:
-  - "name"
   - "parent"
   - "parent"
-  - "throughput"
+  - "name"
+  - "vat-history"
 
 
-# DPDK Performance Changes 3n-skx 4t2c ndr
+# Test configuration - VPP Performance Test Configs 3n-skx
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 3n-skx 4t2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
-  history:
-    -
-      title: "rls1807"
-      data:
-        csit-dpdk-perf-verify-1807-3n-skx:
-        - 1   # NDRPDR sel
-        - 2   # NDRPDR sel
-        - 3   # NDRPDR sel
-        - 6   # NDRPDR sel
-        - 7   # NDRPDR sel
-        - 8   # NDRPDR sel
-        - 9   # NDRPDR sel
-        - 10  # NDRPDR sel
-        - 11  # NDRPDR sel
-        - 12  # NDRPDR sel
-  reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
-      - 4   # 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
-  compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  data: "dpdk-performance-changes-3n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Test configuration - VPP Performance Test Configs 3n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   parameters:
-  - "name"
   - "parent"
   - "parent"
-  - "throughput"
+  - "name"
+  - "vat-history"
 
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+# Test configuration - VPP Performance Test Configs 2n-skx
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
-  reference:
-    title: "3-Node Hsw"
-    data:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  data: "dpdk-compare-testbeds"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Test configuration - VPP Performance Test Configs 2n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-perf-results-2n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   parameters:
+  - "parent"
   - "name"
   - "name"
+  - "vat-history"
+
+# Test configuration - VPP Performance Test Configs 2n-dnv
+-
+  type: "table"
+  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
+  parameters:
   - "parent"
   - "parent"
-  - "throughput"
+  - "name"
+  - "vat-history"
 
 
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
+# Test Operational Data - VPP Performance Operational Data 3n-hsw
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
-  reference:
-    title: "3-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  compare:
-    title: "2-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-  data: "dpdk-compare-topologies"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
+  rows: "generated"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   parameters:
-  - "name"
   - "parent"
   - "parent"
-  - "throughput"
+  - "name"
+  - "show-run"
 
 
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
+# Test Operational Data - VPP Performance Operational Data 3n-skx
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
-  reference:
-    title: "3-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  compare:
-    title: "2-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-  data: "dpdk-compare-topologies"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_test_operational_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
+  rows: "generated"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   parameters:
-  - "name"
   - "parent"
   - "parent"
-  - "throughput"
+  - "name"
+  - "show-run"
 
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+# Test Operational Data - VPP Performance Operational Data 2n-skx
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
-  reference:
-    title: "3-Node Hsw"
-    data:
-      csit-dpdk-perf-verify-1901-3n-hsw:
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-  compare:
-    title: "3-Node Skx"
-    data:
-      csit-dpdk-perf-verify-1901-3n-skx:
-      - 3   # NDRPDR sel
-      - 5   # NDRPDR sel
-      - 6   # NDRPDR sel
-      - 7   # NDRPDR sel
-      - 8   # NDRPDR sel
-      - 9   # NDRPDR sel
-      - 10  # NDRPDR sel
-      - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-  data: "dpdk-compare-testbeds"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Test Operational Data - VPP Performance Operational Data 2n-skx"
+  algorithm: "table_merged_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_test_operational_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
+  rows: "generated"
+  data: "vpp-perf-results-2n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   parameters:
-  - "name"
   - "parent"
   - "parent"
-  - "throughput"
-
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr
-# NOTE: Not used in 18.10
-#-
-#  type: "table"
-#  title: "DPDK Comparison Across Testbeds 3n-hsw to 3n-skx mrr"
-#  algorithm: "table_performance_comparison"
-#  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-mrr"
-#  reference:
-#    title: "3-Node Hsw"
-#    data:
-#      csit-dpdk-perf-verify-1807-3n-hsw:
-#      - 11
-#      - 12  # full
-#      - 14
-#      - 15
-#      - 16
-#      - 17
-#      - 20
-#      - 21
-#      - 22
-#      - 23
-#  compare:
-#    title: "3-Node Skx"
-#    data:
-#      csit-dpdk-perf-verify-1807-3n-skx:
-#      - 1
-#      - 2
-#      - 3
-#      - 6
-#      - 7
-#      - 8
-#      - 9
-#      - 10
-#      - 11
-#      - 12
-#  data: "dpdk-compare-testbeds"
-#  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-#  filter: "'NIC_Intel-X710' and MRR" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "result"
+  - "name"
+  - "show-run"
 
 
-# DPDK Performance Changes 2n-skx 2t1c pdr
+# Test Operational Data - VPP Performance Operational Data 2n-dnv
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
-  reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-2n-skx:
-      - 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
-      - 13  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-  data: "dpdk-performance-changes-2n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Test Operational Data - VPP Performance Operational Data 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_test_operational_2n_dnv"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
   parameters:
   parameters:
-  - "name"
   - "parent"
   - "parent"
-  - "throughput"
+  - "name"
+  - "show-run"
 
 
-# DPDK Performance Changes 2n-skx 4t2c pdr
+# Detailed Test Results - VPP MRR Results 3n-hsw
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
-  reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-2n-skx:
-      - 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
-      - 13  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-  data: "dpdk-performance-changes-2n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Detailed Test Results - VPP MRR Results 3n-hsw"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-mrr-results-3n-hsw"
+  filter: "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "msg"
 
 
-# DPDK Performance Changes 2n-skx 2t1c ndr
+# Detailed Test Results - VPP MRR Results 3n-skx
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
-  reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-2n-skx:
-      - 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
-      - 13  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-  data: "dpdk-performance-changes-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Detailed Test Results - VPP MRR Results 3n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-mrr-results-3n-skx"
+  filter: "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "msg"
 
 
-# DPDK Performance Changes 2n-skx 4t2c ndr
+# Detailed Test Results - VPP MRR Results 2n-skx
 -
   type: "table"
 -
   type: "table"
-  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
-  algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
-  reference:
-    title: "rls1810"
-    data:
-      csit-dpdk-perf-verify-1810-2n-skx:
-      - 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
-      - 13  # NDRPDR sel
-  compare:
-    title: "rls1901"
-    data:
-      csit-dpdk-perf-verify-1901-2n-skx:
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
-      - 18  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-  data: "dpdk-performance-changes-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  title: "Detailed Test Results - VPP MRR Results 2n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "vpp-mrr-results-2n-skx"
+  filter: "'MRR'"
   parameters:
   - "name"
   - "parent"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
+  - "msg"
 
 
-# Detailed Test Results - DPDK Performance Results 3n-hsw
+# Detailed Test Results - VPP MRR Results 2n-dnv
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
+  title: "Detailed Test Results - VPP MRR Results 2n-dnv"
   algorithm: "table_details"
   output-file-ext: ".csv"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
   columns:
   -
     title: "Name"
   columns:
   -
     title: "Name"
@@ -4940,65 +3205,134 @@
     title: "Status"
     data: "data msg"
   rows: "generated"
     title: "Status"
     data: "data msg"
   rows: "generated"
-  data: "dpdk-perf-results-3n-hsw"
-  filter: "all"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "msg"
 
   parameters:
   - "name"
   - "parent"
   - "msg"
 
-# Detailed Test Results - DPDK Performance Results 3n-skx
+# Test configuration - VPP MRR Test Configs 3n-hsw
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
+  title: "Test configuration - VPP MRR Test Configs 3n-hsw"
   algorithm: "table_details"
   output-file-ext: ".csv"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_test_configuration_3n_hsw"
   columns:
   -
     title: "Name"
     data: "data name"
   -
   columns:
   -
     title: "Name"
     data: "data name"
   -
-    title: "Status"
-    data: "data msg"
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
   rows: "generated"
   rows: "generated"
-  data: "dpdk-perf-results-3n-skx"
-  filter: "all"
+  data: "vpp-mrr-results-3n-hsw"
+  filter: "'MRR'"
   parameters:
   parameters:
+  - "parent"
   - "name"
   - "name"
+  - "vat-history"
+
+# Test configuration - VPP MRR Test Configs 3n-skx
+-
+  type: "table"
+  title: "Test configuration - VPP MRR Test Configs 3n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-mrr-results-3n-skx"
+  filter: "'MRR'"
+  parameters:
   - "parent"
   - "parent"
-  - "msg"
+  - "name"
+  - "vat-history"
 
 
-# Detailed Test Results - DPDK Performance Results 2n-skx
+# Test configuration - VPP MRR Test Configs 2n-skx
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
+  title: "Test configuration - VPP MRR Test Configs 2n-skx"
   algorithm: "table_details"
   output-file-ext: ".csv"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-mrr-results-2n-skx"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+# Test configuration - VPP MRR Test Configs 2n-dnv
+-
+  type: "table"
+  title: "Test configuration - VPP MRR Test Configs 2n-dnv"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_test_configuration_2n_dnv"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+# Detailed Test Results - VPP Functional Results - Ubuntu
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Functional Results - Ubuntu"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
   columns:
   -
     title: "Name"
     data: "data name"
   columns:
   -
     title: "Name"
     data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
   -
     title: "Status"
   -
     title: "Status"
-    data: "data msg"
+    data: "data status"
   rows: "generated"
   rows: "generated"
-  data: "dpdk-perf-results-2n-skx"
+  data: "vpp-func-results-ubuntu"
   filter: "all"
   parameters:
   - "name"
   - "parent"
   filter: "all"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "doc"
+  - "status"
 
 
-################################################################################
-# HoneyComb
+# Detailed Test Results - VPP Functional Results - CentOS
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - Honeycomb Functional Results"
+  title: "Detailed Test Results - VPP Functional Results - CentOS"
   algorithm: "table_details"
   output-file-ext: ".csv"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,HC]}/hc_functional_results"
+  output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
   columns:
   -
     title: "Name"
   columns:
   -
     title: "Name"
@@ -5011,7 +3345,7 @@
     data: "data status"
   rows: "generated"
   data:
     data: "data status"
   rows: "generated"
   data:
-    "hc-func-results"
+    "vpp-func-results-centos"
   filter: "all"
   parameters:
   - "name"
   filter: "all"
   parameters:
   - "name"
@@ -5019,14 +3353,79 @@
   - "doc"
   - "status"
 
   - "doc"
   - "status"
 
-################################################################################
-# NSH SFC
+# Test configuration - VPP Functional Test Configs - Ubuntu
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - NSH SFC Functional Results"
+  title: "Test configuration - VPP Functional Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
+  output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-func-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+# Test configuration - VPP Functional Test Configs - CentOS
+-
+  type: "table"
+  title: "Test configuration - VPP Functional Test Configs - CentOS"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
+  rows: "generated"
+  data: "vpp-func-results-centos"
+  filter: "all"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+# Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
+-
+  type: "table"
+  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "ligato-perf-results-3n-hsw"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP Device Results - Ubuntu
+-
+  type: "table"
+  title: "Detailed Test Results - VPP Device Results - Ubuntu"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
   columns:
   -
     title: "Name"
   columns:
   -
     title: "Name"
@@ -5037,9 +3436,8 @@
   -
     title: "Status"
     data: "data status"
   -
     title: "Status"
     data: "data status"
-  rows: "generated"
-  data:
-    "nsh-func-results"
+  rows: "generated"
+  data: "vpp-device-results-ubuntu"
   filter: "all"
   parameters:
   - "name"
   filter: "all"
   parameters:
   - "name"
@@ -5047,355 +3445,547 @@
   - "doc"
   - "status"
 
   - "doc"
   - "status"
 
-################################################################################
-# DMM
+# Test configuration - VPP Device Test Configs - Ubuntu
 -
   type: "table"
 -
   type: "table"
-  title: "Detailed Test Results - DMM Functional Results"
+  title: "Test configuration - VPP Device Test Configs - Ubuntu"
   algorithm: "table_details"
   output-file-ext: ".csv"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
   columns:
   -
     title: "Name"
     data: "data name"
   -
   columns:
   -
     title: "Name"
     data: "data name"
   -
-    title: "Documentation"
-    data: "data doc"
-  -
-    title: "Status"
-    data: "data status"
+    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
+    data: "data vat-history"
   rows: "generated"
   rows: "generated"
-  data:
-    "dmm-func-results"
+  data: "vpp-device-results-ubuntu"
   filter: "all"
   parameters:
   filter: "all"
   parameters:
-  - "name"
   - "parent"
   - "parent"
-  - "doc"
-  - "status"
+  - "name"
+  - "vat-history"
 
 ################################################################################
 
 ################################################################################
-###                                F I L E S                                 ###
-################################################################################
 
 
-# VPP Performance Results 3n-hsw
+# DPDK Performance Changes 3n-hsw 1t1c pdr
 -
 -
-  type: "file"
-  title: "VPP Performance Results 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Performance Changes 3n-hsw 1t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-hsw-cmp"
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Results 3n-skx
+# DPDK Performance Changes 3n-hsw 2t2c pdr
 -
 -
-  type: "file"
-  title: "VPP Performance Results 3n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Performance Changes 3n-hsw 2t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-hsw-cmp"
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Results 2n-skx
+# DPDK Performance Changes 3n-hsw 1t1c ndr
 -
 -
-  type: "file"
-  title: "VPP Performance Results 2n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
-  data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Performance Changes 3n-hsw 1t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-1t1c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-hsw-cmp"
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Results 2n-dnv
+# DPDK Performance Changes 3n-hsw 2t2c ndr
 -
 -
-  type: "file"
-  title: "VPP Performance Results 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
+  type: "table"
+  title: "DPDK Performance Changes 3n-hsw 2t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-hsw-2t2c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-hsw-h1"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-3n-hsw-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-hsw-cmp"
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Configuration 3n-hsw
+# DPDK Performance Changes 3n-skx 2t1c pdr
 -
 -
-  type: "file"
-  title: "VPP Performance Configuration 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_performance_configuration_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Performance Changes 3n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-skx-cmp"
+  data: "dpdk-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-skx 4t2c pdr
+-
+  type: "table"
+  title: "DPDK Performance Changes 3n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-pdr"
+  history:
+    -
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-skx-cmp"
+  data: "dpdk-performance-changes-3n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-skx 2t1c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 3n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-2t1c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-skx-cmp"
+  data: "dpdk-performance-changes-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-skx 4t2c ndr
+-
+  type: "table"
+  title: "DPDK Performance Changes 3n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-3n-skx-4t2c-ndr"
+  history:
+    -
+      title: "rls1807"
+      data: "dpdk-performance-changes-3n-skx-h1"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-3n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-3n-skx-cmp"
+  data: "dpdk-performance-changes-3n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# 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_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
+  reference:
+    title: "3-Node Hsw"
+    data: "dpdk-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "dpdk-compare-testbeds-cmp"
+  data: "dpdk-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# 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_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  reference:
+    title: "3-Node Hsw"
+    data: "dpdk-compare-testbeds-ref"
+  compare:
+    title: "3-Node Skx"
+    data: "dpdk-compare-testbeds-cmp"
+  data: "dpdk-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Configuration 3n-skx
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
 -
 -
-  type: "file"
-  title: "VPP Performance Configuration 3n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_performance_configuration_3n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
+  reference:
+    title: "3-Node Skx"
+    data: "dpdk-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "dpdk-compare-topologies-cmp"
+  data: "dpdk-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Configuration 2n-skx
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
 -
 -
-  type: "file"
-  title: "VPP Performance Configuration 2n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_performance_configuration_2n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
-  data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  reference:
+    title: "3-Node Skx"
+    data: "dpdk-compare-topologies-ref"
+  compare:
+    title: "2-Node Skx"
+    data: "dpdk-compare-topologies-cmp"
+  data: "dpdk-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Configuration 2n-dnv
+# DPDK Performance Changes 2n-skx 2t1c pdr
 -
 -
-  type: "file"
-  title: "VPP Performance Configuration 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 2t1c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-pdr"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Operational Data 3n-hsw
+# DPDK Performance Changes 2n-skx 4t2c pdr
 -
 -
-  type: "file"
-  title: "VPP Performance Operational Data 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 4t2c pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-pdr"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Operational Data 3n-skx
+# DPDK Performance Changes 2n-skx 2t1c ndr
 -
 -
-  type: "file"
-  title: "VPP Performance Operational Data 3n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_performance_operational_data_3n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 2t1c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-2t1c-ndr"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Operational Data 2n-skx
+# DPDK Performance Changes 2n-skx 4t2c ndr
 -
 -
-  type: "file"
-  title: "VPP Performance Operational Data 2n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_performance_operational_data_2n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
-  data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  type: "table"
+  title: "DPDK Performance Changes 2n-skx 4t2c ndr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-changes-2n-skx-4t2c-ndr"
+  reference:
+    title: "rls1810"
+    data: "dpdk-performance-changes-2n-skx-ref"
+  compare:
+    title: "rls1901"
+    data: "dpdk-performance-changes-2n-skx-cmp"
+  data: "dpdk-performance-changes-2n-skx"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "throughput"
 
 
-# VPP Performance Operational Data 2n-dnv
+# Detailed Test Results - DPDK Performance Results 3n-hsw
 -
 -
-  type: "file"
-  title: "VPP Performance Operational Data 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-hsw"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-hsw"
+  filter: "all"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "msg"
 
 
-# VPP MRR Results 3n-hsw
+# Detailed Test Results - DPDK Performance Results 3n-skx
 -
 -
-  type: "file"
-  title: "VPP MRR Results 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP,3N,HSW]}"
-  data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 3n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-3n-skx"
+  filter: "all"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "msg"
 
 
-# VPP MRR Results 3n-skx
+# Detailed Test Results - DPDK Performance Results 2n-skx
 -
 -
-  type: "file"
-  title: "VPP MRR Results 3n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP,3N,SKX]}"
-  data: "vpp-mrr-results-3n-skx"
-  filter: "'MRR'"
+  type: "table"
+  title: "Detailed Test Results - DPDK Performance Results 2n-skx"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data: "dpdk-perf-results-2n-skx"
+  filter: "all"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "msg"
 
 
-# VPP MRR Results 2n-skx
+################################################################################
+# HoneyComb
 -
 -
-  type: "file"
-  title: "VPP MRR Results 2n-skx"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP,2N,SKX]}"
-  data: "vpp-mrr-results-2n-skx"
+  type: "table"
+  title: "Detailed Test Results - Honeycomb Functional Results"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,HC]}/hc_functional_results"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data:
+    "hc-func-results"
   filter: "all"
   parameters:
   - "name"
   filter: "all"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "doc"
+  - "status"
 
 
-# VPP MRR Results 2n-dnv
+################################################################################
+# NSH SFC
 -
 -
-  type: "file"
-  title: "VPP MRR Results 2n-dnv"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
+  type: "table"
+  title: "Detailed Test Results - NSH SFC Functional Results"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data:
+    "nsh-func-results"
+  filter: "all"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "doc"
+  - "status"
 
 
-# VPP MRR Configuration 3n-hsw
+################################################################################
+# DMM
 -
 -
-  type: "file"
-  title: "VPP MRR Configuration 3n-hsw"
-  algorithm: "file_test_results"
-  output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_configuration_3n_hsw"
-  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,MRR,VPP,3N,HSW]}"
-  data: "vpp-mrr-results-3n-hsw"
-  filter: "'MRR'"
+  type: "table"
+  title: "Detailed Test Results - DMM Functional Results"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data:
+    "dmm-func-results"
+  filter: "all"
   parameters:
   - "name"
   parameters:
   - "name"
-  - "doc"
-  - "level"
   - "parent"
   - "parent"
-  data-start-level: 3
+  - "doc"
+  - "status"
 
 
-# VPP MRR Configuration 3n-skx
+################################################################################
+###                                F I L E S                                 ###
+################################################################################
+
+# VPP Performance Results 3n-hsw
 -
   type: "file"
 -
   type: "file"
-  title: "VPP MRR Configuration 3n-skx"
+  title: "VPP Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_configuration_3n_skx"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,MRR,VPP,3N,SKX]}"
-  data: "vpp-mrr-results-3n-skx"
-  filter: "'MRR'"
+  dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5403,17 +3993,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP MRR Configuration 2n-skx
+# VPP Performance Results 3n-skx
 -
   type: "file"
 -
   type: "file"
-  title: "VPP MRR Configuration 2n-skx"
+  title: "VPP Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_configuration_2n_skx"
+  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,MRR,VPP,2N,SKX]}"
-  data: "vpp-mrr-results-2n-skx"
-  filter: "'MRR'"
+  dir-tables: "{DIR[DTR,PERF,VPP,3N,SKX]}"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5421,17 +4011,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP MRR Configuration 2n-dnv
+# VPP Performance Results 2n-skx
 -
   type: "file"
 -
   type: "file"
-  title: "VPP MRR Configuration 2n-dnv"
+  title: "VPP Performance Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv"
+  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'MRR'"
+  dir-tables: "{DIR[DTR,PERF,VPP,2N,SKX]}"
+  data: "vpp-perf-results-2n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5439,17 +4029,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP Functional Results - Ubuntu
+# VPP Performance Results 2n-dnv
 -
   type: "file"
 -
   type: "file"
-  title: "VPP Functional Results - Ubuntu"
+  title: "VPP Performance Results 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,FUNC,VPP,UBUNTU]}"
-  data: "vpp-func-results-ubuntu"
-  filter: "all"
+  dir-tables: "{DIR[DTR,PERF,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5457,18 +4047,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP Functional Results - CentOS
+# VPP Performance Configuration 3n-hsw
 -
   type: "file"
 -
   type: "file"
-  title: "VPP Functional Results - CentOS"
+  title: "VPP Performance Configuration 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_performance_configuration_3n_hsw"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,FUNC,VPP,CENTOS]}"
-  data:
-    "vpp-func-results-centos"
-  filter: "all"
+  dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5476,17 +4065,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP Functional Configuration - Ubuntu
+# VPP Performance Configuration 3n-skx
 -
   type: "file"
 -
   type: "file"
-  title: "VPP Functional Configuration - Ubuntu"
+  title: "VPP Performance Configuration 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
+  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_performance_configuration_3n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,FUNC,VPP,UBUNTU]}"
-  data: "vpp-func-results-ubuntu"
-  filter: "all"
+  dir-tables: "{DIR[DTC,PERF,VPP,3N,SKX]}"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5494,18 +4083,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP Functional Configuration - CentOS
+# VPP Performance Configuration 2n-skx
 -
   type: "file"
 -
   type: "file"
-  title: "VPP Functional Configuration - CentOS"
+  title: "VPP Performance Configuration 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
+  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_performance_configuration_2n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,FUNC,VPP,CENTOS]}"
-  data:
-    "vpp-func-results-centos"
-  filter: "all"
+  dir-tables: "{DIR[DTC,PERF,VPP,2N,SKX]}"
+  data: "vpp-perf-results-2n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5513,53 +4101,53 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# VPP Device Results - Ubuntu
+# VPP Performance Configuration 2n-dnv
 -
   type: "file"
 -
   type: "file"
-  title: "VPP Device Results - Ubuntu"
+  title: "VPP Performance Configuration 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_performance_configuration_2n_dnv"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
+  dir-tables: "{DIR[DTC,PERF,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2
+  data-start-level: 3
 
 
-# VPP Device Configuration - Ubuntu
+# VPP Performance Operational Data 3n-hsw
 -
   type: "file"
 -
   type: "file"
-  title: "VPP Device Configuration - Ubuntu"
+  title: "VPP Performance Operational Data 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_3n_hsw"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
+  dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2
+  data-start-level: 3
 
 
-# Container Orchestrated Performance Results 3n-hsw
+# VPP Performance Operational Data 3n-skx
 -
   type: "file"
 -
   type: "file"
-  title: "Container Orchestrated Performance Results 3n-hsw"
+  title: "VPP Performance Operational Data 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
+  output-file: "{DIR[DTO,PERF,VPP,3N,SKX]}/vpp_performance_operational_data_3n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
-  data: "ligato-perf-results-3n-hsw"
-  filter: "all"
+  dir-tables: "{DIR[DTO,PERF,VPP,3N,SKX]}"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5567,17 +4155,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# DPDK Performance Results 3n-hsw
+# VPP Performance Operational Data 2n-skx
 -
   type: "file"
 -
   type: "file"
-  title: "DPDK Performance Results 3n-hsw"
+  title: "VPP Performance Operational Data 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  output-file: "{DIR[DTO,PERF,VPP,2N,SKX]}/vpp_performance_operational_data_2n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
-  data: "dpdk-perf-results-3n-hsw"
-  filter: "all"
+  dir-tables: "{DIR[DTO,PERF,VPP,2N,SKX]}"
+  data: "vpp-perf-results-2n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5585,17 +4173,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# DPDK Performance Results 3n-skx
+# VPP Performance Operational Data 2n-dnv
 -
   type: "file"
 -
   type: "file"
-  title: "DPDK Performance Results 3n-skx"
+  title: "VPP Performance Operational Data 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  output-file: "{DIR[DTO,PERF,VPP,2N,DNV]}/vpp_performance_operational_data_2n_dnv"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
-  data: "dpdk-perf-results-3n-skx"
-  filter: "all"
+  dir-tables: "{DIR[DTO,PERF,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5603,17 +4191,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# DPDK Performance Results 2n-skx
+# VPP MRR Results 3n-hsw
 -
   type: "file"
 -
   type: "file"
-  title: "DPDK Performance Results 2n-skx"
+  title: "VPP MRR Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+  output-file: "{DIR[DTR,MRR,VPP,3N,HSW]}/vpp_mrr_results_3n_hsw"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
-  data: "dpdk-perf-results-2n-skx"
-  filter: "all"
+  dir-tables: "{DIR[DTR,MRR,VPP,3N,HSW]}"
+  data: "vpp-mrr-results-3n-hsw"
+  filter: "'MRR'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5621,18 +4209,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# Honeycomb Functional Results
+# VPP MRR Results 3n-skx
 -
   type: "file"
 -
   type: "file"
-  title: "Honeycomb Functional Results"
+  title: "VPP MRR Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,HC]}/honeycomb_functional_results"
+  output-file: "{DIR[DTR,MRR,VPP,3N,SKX]}/vpp_mrr_results_3n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,FUNC,HC]}"
-  data:
-    "hc-func-results"
-  filter: "all"
+  dir-tables: "{DIR[DTR,MRR,VPP,3N,SKX]}"
+  data: "vpp-mrr-results-3n-skx"
+  filter: "'MRR'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5640,17 +4227,16 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# NSH SFC Functional Results
+# VPP MRR Results 2n-skx
 -
   type: "file"
 -
   type: "file"
-  title: "NSH SFC Functional Results"
+  title: "VPP MRR Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
+  output-file: "{DIR[DTR,MRR,VPP,2N,SKX]}/vpp_mrr_results_2n_skx"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
-  data:
-    "nsh-func-results"
+  dir-tables: "{DIR[DTR,MRR,VPP,2N,SKX]}"
+  data: "vpp-mrr-results-2n-skx"
   filter: "all"
   parameters:
   - "name"
   filter: "all"
   parameters:
   - "name"
@@ -5659,18 +4245,17 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-# DMM Functional Results
+# VPP MRR Results 2n-dnv
 -
   type: "file"
 -
   type: "file"
-  title: "DMM Functional Results"
+  title: "VPP MRR Results 2n-dnv"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
+  output-file: "{DIR[DTR,MRR,VPP,2N,DNV]}/vpp_mrr_results_2n_dnv"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
-  dir-tables: "{DIR[DTR,FUNC,DMM]}"
-  data:
-    "dmm-func-results"
-  filter: "all"
+  dir-tables: "{DIR[DTR,MRR,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
   parameters:
   - "name"
   - "doc"
   parameters:
   - "name"
   - "doc"
@@ -5678,702 +4263,383 @@
   - "parent"
   data-start-level: 3
 
   - "parent"
   data-start-level: 3
 
-################################################################################
-###                                P L O T S                                 ###
-################################################################################
-
-# Soak test - 30min Soak Test (PLRsearch), boxes
--
-  type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
-  algorithm: "plot_soak_boxes"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
-  data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
-  layout:
-    title: "30min Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-# Soak test - example, not used
--
-  type: "plot"
-  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
-  algorithm: "plot_soak_bars"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
-  data: "plot-vpp-soak-2n-skx"
-  filter: "'SOAK'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-#  - "L2XCBASE"
-#  - "L2BDMACLRN"
-#  - "IP4FWD"
-#  - "IP6FWD"
-  - "VHOST"
-  layout:
-    title: "30min Soak Test (PLRsearch)"
-    layout: "plot-soak-throughput"
-
-################################################################################
-# Plots - NF Density - VSC
-
--
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' 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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
-    layout: "plot-service-density"
-
--
-  type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' 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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
-    layout: "plot-service-density"
-
--
-  type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' 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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
-    layout: "plot-service-density"
-
--
-  type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' 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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
-    layout: "plot-service-density"
-
--
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' 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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
-    layout: "plot-service-density"
-
+# VPP MRR Configuration 3n-hsw
 -
 -
-  type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
+  type: "file"
+  title: "VPP MRR Configuration 3n-hsw"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,MRR,VPP,3N,HSW]}/vpp_mrr_configuration_3n_hsw"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,MRR,VPP,3N,HSW]}"
+  data: "vpp-mrr-results-3n-hsw"
+  filter: "'MRR'"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# VPP MRR Configuration 3n-skx
 -
 -
-  type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
+  type: "file"
+  title: "VPP MRR Configuration 3n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_configuration_3n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,MRR,VPP,3N,SKX]}"
+  data: "vpp-mrr-results-3n-skx"
+  filter: "'MRR'"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# VPP MRR Configuration 2n-skx
 -
 -
-  type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
+  type: "file"
+  title: "VPP MRR Configuration 2n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_configuration_2n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,MRR,VPP,2N,SKX]}"
+  data: "vpp-mrr-results-2n-skx"
+  filter: "'MRR'"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# VPP MRR Configuration 2n-dnv
 -
 -
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
+  type: "file"
+  title: "VPP MRR Configuration 2n-dnv"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,MRR,VPP,2N,DNV]}/vpp_mrr_configuration_2n_dnv"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,MRR,VPP,2N,DNV]}"
+  data: "intel-dnv-vpp"
+  filter: "'MRR'"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# VPP Functional Results - Ubuntu
 -
 -
-  type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
+  type: "file"
+  title: "VPP Functional Results - Ubuntu"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,VPP,UBUNTU]}"
+  data: "vpp-func-results-ubuntu"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# VPP Functional Results - CentOS
 -
 -
-  type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
+  type: "file"
+  title: "VPP Functional Results - CentOS"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,VPP,CENTOS]}"
+  data:
+    "vpp-func-results-centos"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# VPP Functional Configuration - Ubuntu
 -
 -
-  type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'VM' and
-           'CHAIN' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
+  type: "file"
+  title: "VPP Functional Configuration - Ubuntu"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,FUNC,VPP,UBUNTU]}"
+  data: "vpp-func-results-ubuntu"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
-    layout: "plot-service-density"
-
-################################################################################
-# Plots - NF Density - CSC
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
--
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           '64B' and
-           '2T1C' and
-           'MRR'"
+# VPP Functional Configuration - CentOS
+-
+  type: "file"
+  title: "VPP Functional Configuration - CentOS"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,FUNC,VPP,CENTOS]}"
+  data:
+    "vpp-func-results-centos"
+  filter: "all"
   parameters:
   parameters:
-  - "result"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# VPP Device Results - Ubuntu
 -
 -
-  type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           '64B' and
-           '4T2C' and
-           'MRR'"
+  type: "file"
+  title: "VPP Device Results - Ubuntu"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
   parameters:
   parameters:
-  - "result"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2
 
 
+# VPP Device Configuration - Ubuntu
 -
 -
-  type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'IMIX' and
-           '2T1C' and
-           'MRR'"
+  type: "file"
+  title: "VPP Device Configuration - Ubuntu"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
   parameters:
   parameters:
-  - "result"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 2
 
 
+# Container Orchestrated Performance Results 3n-hsw
 -
 -
-  type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr"
-  data: "plot-vpp-nfv-2n-skx-mrr"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'IMIX' and
-           '4T2C' and
-           'MRR'"
+  type: "file"
+  title: "Container Orchestrated Performance Results 3n-hsw"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
+  data: "ligato-perf-results-3n-hsw"
+  filter: "all"
   parameters:
   parameters:
-  - "result"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# DPDK Performance Results 3n-hsw
 -
 -
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
+  type: "file"
+  title: "DPDK Performance Results 3n-hsw"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,HSW]}/dpdk_performance_results_3n_hsw"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
+  data: "dpdk-perf-results-3n-hsw"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# DPDK Performance Results 3n-skx
 -
 -
-  type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
+  type: "file"
+  title: "DPDK Performance Results 3n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,DPDK,3N,SKX]}/dpdk_performance_results_3n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
+  data: "dpdk-perf-results-3n-skx"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# DPDK Performance Results 2n-skx
 -
 -
-  type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
+  type: "file"
+  title: "DPDK Performance Results 2n-skx"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,DPDK,2N,SKX]}/dpdk_performance_results_2n_skx"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
+  data: "dpdk-perf-results-2n-skx"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# Honeycomb Functional Results
 -
 -
-  type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
+  type: "file"
+  title: "Honeycomb Functional Results"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,HC]}/honeycomb_functional_results"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,HC]}"
+  data:
+    "hc-func-results"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# NSH SFC Functional Results
 -
 -
-  type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           '64B' and
-           '2T1C' and
-           'NDRPDR'"
+  type: "file"
+  title: "NSH SFC Functional Results"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
+  data:
+    "nsh-func-results"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+# DMM Functional Results
 -
 -
-  type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           '64B' and
-           '4T2C' and
-           'NDRPDR'"
+  type: "file"
+  title: "DMM Functional Results"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,DMM]}/dmm_functional_results"
+  file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
+  dir-tables: "{DIR[DTR,FUNC,DMM]}"
+  data:
+    "dmm-func-results"
+  filter: "all"
   parameters:
   parameters:
-  - "throughput"
   - "name"
   - "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-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
-    layout: "plot-service-density"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
 
+################################################################################
+###                                P L O T S                                 ###
+################################################################################
+
+# Soak test - 30min Soak Test (PLRsearch), boxes
 -
   type: "plot"
 -
   type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "VPP Throughput: 30min Soak Test (PLRsearch) boxes"
+  algorithm: "plot_soak_boxes"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'IMIX' and
-           '2T1C' and
-           'NDRPDR'"
+  output-file: "{DIR[STATIC,VPP]}/example-soak-boxes"
+  data: "plot-vpp-soak-2n-skx"
+  filter: "'SOAK'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "name"
+  - "parent"
   - "tags"
   - "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]"
+  sort:
+  - "L2PATCH"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  - "IP6FWD"
+  - "VHOST"
   layout:
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
-    layout: "plot-service-density"
+    title: "30min Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
 
 
+# Soak test - example, not used
 -
   type: "plot"
 -
   type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
-  algorithm: "plot_service_density_heatmap"
+  title: "VPP Throughput: 30min Soak Test (PLRsearch) bars"
+  algorithm: "plot_soak_bars"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
-  data: "plot-vpp-nfv-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           'NF_DENSITY' and
-           'DOCKER' and
-           'CHAIN' and
-           'IMIX' and
-           '4T2C' and
-           'NDRPDR'"
+  output-file: "{DIR[STATIC,VPP]}/example-soak-bars"
+  data: "plot-vpp-soak-2n-skx"
+  filter: "'SOAK'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "name"
+  - "parent"
   - "tags"
   - "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]"
+  sort:
+  - "L2PATCH"
+#  - "L2XCBASE"
+#  - "L2BDMACLRN"
+#  - "IP4FWD"
+#  - "IP6FWD"
+  - "VHOST"
   layout:
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
-    layout: "plot-service-density"
+    title: "30min Soak Test (PLRsearch)"
+    layout: "plot-soak-throughput"
 
 ################################################################################
 
 ################################################################################
-# Plots - NF Density - CSP
+# Plots - NF Density - VSC
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-mrr"
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '2T1C' and
            'MRR'"
            '64B' and
            '2T1C' and
            'MRR'"
@@ -6382,24 +4648,24 @@
   - "name"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-mrr"
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '4T2C' and
            'MRR'"
            '64B' and
            '4T2C' and
            'MRR'"
@@ -6408,24 +4674,24 @@
   - "name"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
   z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-mrr"
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            'IMIX' and
            '2T1C' and
            'MRR'"
            'IMIX' and
            '2T1C' and
            'MRR'"
@@ -6434,24 +4700,24 @@
   - "name"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-mrr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-mrr"
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            'IMIX' and
            '4T2C' and
            'MRR'"
            'IMIX' and
            '4T2C' and
            'MRR'"
@@ -6460,24 +4726,24 @@
   - "name"
   - "tags"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
   z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-mrr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-ndr"
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
@@ -6486,24 +4752,24 @@
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-ndr"
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
@@ -6512,24 +4778,24 @@
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
   z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-ndr"
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
@@ -6538,24 +4804,24 @@
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-ndr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-ndr"
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
@@ -6564,24 +4830,24 @@
   - "name"
   - "tags"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
   z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-vsc-pdr"
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '2T1C' and
            'NDRPDR'"
            '64B' and
            '2T1C' and
            'NDRPDR'"
@@ -6590,24 +4856,24 @@
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-vsc-pdr"
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            '64B' and
            '4T2C' and
            'NDRPDR'"
            '64B' and
            '4T2C' and
            'NDRPDR'"
@@ -6616,24 +4882,24 @@
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
   z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-vsc-pdr"
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
@@ -6642,24 +4908,24 @@
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
     layout: "plot-service-density"
 
 -
   type: "plot"
     layout: "plot-service-density"
 
 -
   type: "plot"
-  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}vhost-{b}chain-{c}vm-l3fwdip4-pdr"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-vsc-pdr"
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
   data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
            'NF_DENSITY' and
-           'DOCKER' and
-           'PIPELINE' and
+           'VM' and
+           'CHAIN' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
@@ -6668,760 +4934,708 @@
   - "name"
   - "tags"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
   - "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 = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
   z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
   layout:
-    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
     layout: "plot-service-density"
 
 ################################################################################
     layout: "plot-service-density"
 
 ################################################################################
-# Plots VPP HTTP Server Performance
+# Plots - NF Density - CSC
+
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
-  data:
-    "plot-vpp-http-server-performance"
-  # Keep this formatting, the filter is enclosed with " (quotation mark) and
-  # each tag is enclosed with ' (apostrophe).
-  filter: "'HTTP' and 'TCP_CPS'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '2T1C' and
+           'MRR'"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "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:
   layout:
-    title: "VPP HTTP Server Performance"
-    layout:
-      "plot-cps"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP HTTP Server Performance"
-  algorithm: "plot_http_server_performance_box"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
-  data:
-    "plot-vpp-http-server-performance"
-  filter: "'HTTP' and 'TCP_RPS'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           '64B' and
+           '4T2C' and
+           'MRR'"
   parameters:
   - "result"
   - "name"
   parameters:
   - "result"
   - "name"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  - "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:
   layout:
-    title: "VPP HTTP Server Performance"
-    layout:
-      "plot-rps"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
 
-################################################################################
+-
+  type: "plot"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' 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-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
 
-# Packet Throughput - VPP L2 3n-hsw-x520 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' 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-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
+
+-
+  type: "plot"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' 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:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
 
-# Packet Throughput - VPP L2 3n-hsw-x520 features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
            '64B' and
            '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}chain-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csc-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'CHAIN' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots - NF Density - CSP
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
            '64B' and
            '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'MRR'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
+  - "result"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
 
-# Packet Throughput - VPP L2 3n-hsw-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
   filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'MRR'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
+  - "result"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
+  - "result"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-mrr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
   filter: "'NIC_Intel-X710' and
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
+  - "result"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
   filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCFWD"
-  - "L2PATCH"
-  - "L2BDMACLRN"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
 
-# Packet Throughput - VPP L2 3n-hsw-x710 features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '1T1C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-ndr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
   filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
   filter: "'NIC_Intel-X710' and
   filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
            '64B' and
            '64B' and
-           'NDRPDR' and
-           '2T2C' and
-           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
-           not 'ACL' and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2XCBASE"    # l2xcbase
-  - "L2BDBASE"    # l2bdbase
-  - "L2XCFWD"     # dot1q-l2xcbase
-  - "L2BDMACLRN"  # dot1q-l2bdbase
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
 
-# Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: 64B-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+           '4T2C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-1c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'NDRPDR'"
   parameters:
   - "throughput"
   parameters:
   - "throughput"
-  - "parent"
+  - "name"
   - "tags"
   - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
+  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:
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
+  title: "Packet Throughput: IMIX-2c-eth-l2bd-{a}memif-{b}pipe-{c}drc-vppip4-pdr"
+  algorithm: "plot_service_density_heatmap"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+  output-file: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' 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-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots VPP HTTP Server Performance
+-
+  type: "plot"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-cps"
+  data:
+    "plot-vpp-http-server-performance"
+  # Keep this formatting, the filter is enclosed with " (quotation mark) and
+  # each tag is enclosed with ' (apostrophe).
+  filter: "'HTTP' and 'TCP_CPS'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "result"
+  - "name"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-cps"
 
 -
   type: "plot"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
+  title: "VPP HTTP Server Performance"
+  algorithm: "plot_http_server_performance_box"
   output-file-type: ".html"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           ('BASE' or 'SCALE') and
-           'NDRPDR' and
-           'ETH' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
-           not 'VHOST' and
-           not 'MEMIF'"
+  output-file: "{DIR[STATIC,VPP]}/http-server-performance-rps"
+  data:
+    "plot-vpp-http-server-performance"
+  filter: "'HTTP' and 'TCP_RPS'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "result"
+  - "name"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+    title: "VPP HTTP Server Performance"
+    layout:
+      "plot-rps"
 
 
-# Packet Throughput - VPP L2 3n-skx-x710 base and scale
+################################################################################
+
+# Packet Throughput - VPP L2 3n-hsw-x520 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   parameters:
   - "throughput"
   - "parent"
@@ -7438,26 +5652,25 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   parameters:
   - "throughput"
   - "parent"
@@ -7474,26 +5687,25 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   parameters:
   - "throughput"
   - "parent"
@@ -7510,26 +5722,25 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   parameters:
   - "throughput"
   - "parent"
@@ -7546,21 +5757,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-x710 features
+# Packet Throughput - VPP L2 3n-hsw-x520 features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
@@ -7579,20 +5790,20 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
@@ -7611,20 +5822,20 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+    title: "l2sw-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
@@ -7643,20 +5854,20 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
            (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
            not 'ACL' and
            not 'VHOST' and
@@ -7675,35 +5886,34 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+    title: "l2sw-3n-hsw-x520-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
+# Packet Throughput - VPP L2 3n-hsw-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -7712,34 +5922,33 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -7748,34 +5957,33 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -7784,34 +5992,33 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF' and
-           not 'DRV_AVF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
@@ -7820,164 +6027,156 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-x710 base and scale
+# Packet Throughput - VPP L2 3n-hsw-x710 features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '1T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '1T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
+           not 'L2OVRLAY' and
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-x710-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-skx-xxv710 base and scale
+# Packet Throughput - VPP L2 3n-hsw-xl710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -7987,32 +6186,29 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '2T1C' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -8022,32 +6218,29 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -8057,32 +6250,29 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '4T2C' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            not 'MEMIF'"
@@ -8092,849 +6282,858 @@
   - "tags"
   sort:
   - "L2PATCH"
   - "tags"
   sort:
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
-  - "FIB_10K"
-  - "FIB_100K"
-  - "FIB_1M"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP L2 2n-dnv-x553 base
+# Packet Throughput - VPP L2 3n-skx-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'BASE' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            'NDRPDR' and
            'ETH' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   - "L2PATCH"
   - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '1T1C' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   - "L2PATCH"
   - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   - "L2PATCH"
   - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            'ETH' and
-           '2T2C' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCBASE"
-  - "L2BDMACLRN"
   - "L2PATCH"
   - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP Container Memif 3n-hsw-x520
+# Packet Throughput - VPP L2 3n-skx-x710 features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-2t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T1C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-x710-64b-4t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '4T2C' and
+           (('L2BDMACLRN' and ('L2BDBASE' or 'DOT1Q')) or ('L2XCFWD' and ('L2XCBASE' or 'DOT1Q'))) and
+           not 'ACL' and
            not 'VHOST' and
            not 'VHOST' and
-           'MEMIF'"
+           not 'DRV_AVF' and
+           not 'L2OVRLAY' and
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"    # l2xcbase
+  - "L2BDBASE"    # l2bdbase
+  - "L2XCFWD"     # dot1q-l2xcbase
+  - "L2BDMACLRN"  # dot1q-l2bdbase
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-x710
+# Packet Throughput - VPP L2 3n-skx-xxv710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           'ETH' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           'ETH' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           'ETH' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           'ETH' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2PATCH"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-3n-skx-xxv710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-hsw-xl710
+# Packet Throughput - VPP L2 2n-skx-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           'ETH' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
+           'ETH' and
+           '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           'ETH' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
+           'ETH' and
+           '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 3n-skx-x710
+# Packet Throughput - VPP L2 2n-skx-xxv710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
+           'ETH' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2PATCH"
+  - "L2XCBASE"
+  - "BASE"
+  - "FIB_10K"
+  - "FIB_100K"
+  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 2n-skx-x710
+# Packet Throughput - VPP L2 2n-dnv-x553 base
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
            '64B' and
-           ('BASE' or 'SCALE') and
+           'BASE' and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           'ETH' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2PATCH"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
+           'ETH' and
+           '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2PATCH"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
+           'ETH' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2PATCH"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
+           'ETH' and
+           '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           'MEMIF'"
+           not 'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2XCFWD"
-  - "L2BDMACLRN"
-  - "L2BDMACLRN"
+  - "L2XCBASE"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "L2PATCH"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Memif 2n-skx-xxv710
+################################################################################
+
+# Packet Throughput - VPP Container Memif 3n-hsw-x520
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -8948,27 +7147,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -8982,27 +7182,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "memif-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9016,27 +7217,28 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '4T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           '2T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9050,30 +7252,29 @@
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
   - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "memif-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
+# Packet Throughput - VPP Container Memif 3n-hsw-x710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9081,32 +7282,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9114,32 +7317,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+    title: "memif-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9147,32 +7352,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+  title: "VPP Throughput: memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           'L2XCFWD' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9180,33 +7387,35 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+    title: "memif-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
+# Packet Throughput - VPP Container Memif 3n-hsw-xl710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9214,32 +7423,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9247,32 +7458,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+    title: "memif-3n-hsw-xl710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9280,32 +7493,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+  title: "VPP Throughput: memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9313,33 +7528,35 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+    title: "memif-3n-hsw-xl710-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
+# Packet Throughput - VPP Container Memif 3n-skx-x710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9347,32 +7564,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           'L2XCFWD' and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9380,32 +7599,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+    title: "memif-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9413,32 +7634,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+  title: "VPP Throughput: memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           'L2XCFWD' and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            'MEMIF'"
   parameters:
            not 'VHOST' and
            'MEMIF'"
   parameters:
@@ -9446,989 +7669,1001 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+    title: "memif-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
+# Packet Throughput - VPP Container Memif 2n-skx-x710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+    title: "memif-2n-skx-x710-64b-2t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-2t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-2t1c-base-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '1T1C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+    title: "memif-2n-skx-x710-64b-2t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+    title: "memif-2n-skx-x710-64b-4t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+  title: "VPP Throughput: memif-2n-skx-x710-64b-4t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
-  data: "plot-ligato-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-x710-64b-4t2c-base-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('BASE' or 'SCALE') and
            'NDRPDR' and
-           '2T2C' and
-           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
            not 'VHOST' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "1VNF"
-  - "2VNF"
-  - "4VNF"
-  - "2VNF"
-  - "4VNF"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+    title: "memif-2n-skx-x710-64b-4t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv4 3n-hsw-x520 base and scale
+# Packet Throughput - VPP Container Memif 2n-skx-xxv710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "memif-2n-skx-xxv710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH' or 'IP4FWD') and
+           not 'VHOST' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "IP4FWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "memif-2n-skx-xxv710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features
+################################################################################
+
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2xc
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
-           ('IP4BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            ('NAT44' and 'BASE') or
-            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "NAT44"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACL"
-  - "OACL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-pdr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features nat44
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x520 l2bd
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
+    title: "k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
   filter: "'NIC_Intel-X520-DA2' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'NAT44' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "BASE"
-  - "BASE"
-  - "SRC_USER_10"
-  - "SRC_USER_100"
-  - "SRC_USER_1000"
-  - "SRC_USER_2000"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
+    title: "k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features iacl
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2xc
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           'L2XCFWD' and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2xc-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
+# Packet Throughput - VPP Container Orchestrated Memif 3n-hsw-x710 l2bd
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
+    title: "k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+  title: "VPP Throughput: k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
+  data: "plot-ligato-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
+           ('BASE' or 'SCALE') and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP4FWD' and
-           'OACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('L2BDMACSTAT' or 'L2BDMACLRN') and
+           not 'VHOST' and
+           not 'NF_DENSITY' and
+           'MEMIF'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
+  - "1VNF"
+  - "2VNF"
+  - "4VNF"
+  - "2VNF"
+  - "4VNF"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
+    title: "k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-l2bd-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
+################################################################################
+
+# Packet Throughput - VPP IPv4 3n-hsw-x520 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
@@ -10445,6 +8680,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -10456,17 +8692,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
@@ -10483,6 +8719,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -10494,17 +8731,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
@@ -10521,6 +8758,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -10532,17 +8770,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
            '64B' and
            ('IP4BASE' or
             'POLICE_MARK' or
@@ -10559,6 +8797,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -10570,23 +8809,24 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features nat44
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10594,7 +8834,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -10605,22 +8845,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10628,7 +8869,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -10639,22 +8880,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10662,7 +8904,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -10673,22 +8915,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
+           not 'DOT1Q' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -10696,7 +8939,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -10707,31 +8950,32 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features iacl
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -10741,30 +8985,31 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -10774,30 +9019,31 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -10807,190 +9053,59 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
-  - "tags"
-  sort:
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  - "ACL_STATELESS"
-  - "ACL_STATEFUL"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
-    layout: "plot-throughput"
-
-## Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '2T1C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-skx"
-#  filter: "'NIC_Intel-X710' and
-#           '64B' and
-#           'NDRPDR' and
-#           '4T2C' and
-#           'IP4FWD' and
-#           'OACL' and
-#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
-#           not 'IPSEC' and
-#           not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  - "ACL_STATELESS"
-#  - "ACL_STATEFUL"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
-#    layout: "plot-throughput"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-iacl-pdr"
+    layout: "plot-throughput"
 
 
-# Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
+# Packet Throughput - VPP IPv4 3n-hsw-x520 features oacl
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -10998,31 +9113,33 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -11030,31 +9147,33 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x520-64b-1t1c-features-oacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -11062,31 +9181,33 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP4FWD' and
+           ('OACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -11094,32 +9215,34 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x520-64b-2t2c-features-oacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
+# Packet Throughput - VPP IPv4 3n-hsw-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -11135,23 +9258,24 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -11167,23 +9291,24 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -11199,23 +9324,24 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -11231,17 +9357,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 features
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -11250,7 +9376,7 @@
             ('NAT44' and 'BASE') or
             ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
             ('NAT44' and 'BASE') or
             ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -11259,6 +9385,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -11270,16 +9397,16 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -11288,7 +9415,7 @@
             ('NAT44' and 'BASE') or
             ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
             ('NAT44' and 'BASE') or
             ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -11297,6 +9424,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -11308,16 +9436,16 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -11326,7 +9454,7 @@
             ('NAT44' and 'BASE') or
             ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
             ('NAT44' and 'BASE') or
             ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -11335,6 +9463,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -11346,16 +9475,16 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
   filter: "'NIC_Intel-X710' and
            '64B' and
            ('IP4BASE' or
@@ -11364,7 +9493,7 @@
             ('NAT44' and 'BASE') or
             ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
             ('NAT44' and 'BASE') or
             ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -11373,6 +9502,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
@@ -11384,23 +9514,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features nat44
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11408,7 +9538,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -11419,22 +9549,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11442,7 +9572,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -11453,22 +9583,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11476,7 +9606,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -11487,22 +9617,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            'IP4FWD' and
-           'NAT44' and
+           ('NAT44' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11510,7 +9640,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "BASE"
+  - "IP4BASE"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
   - "BASE"
   - "SRC_USER_10"
   - "SRC_USER_100"
@@ -11521,24 +9651,23 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
+# Packet Throughput - VPP IPv4 3n-hsw-x710 features iacl
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11546,6 +9675,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -11555,23 +9685,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11579,6 +9708,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -11588,23 +9718,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11612,6 +9741,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -11621,23 +9751,22 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
   filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            'IP4FWD' and
-           'IACL' and
-           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -11645,6 +9774,7 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
+  - "IP4BASE"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
   - "ACL_STATELESS"
   - "ACL_STATEFUL"
   - "ACL_STATELESS"
@@ -11654,21 +9784,21 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-## Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
+## Packet Throughput - VPP IPv4 3n-hsw-x710 features oacl
 #-
 #  type: "plot"
 #-
 #  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
-#           '1T1C' and
+#           '2T1C' and
 #           'IP4FWD' and
 #           'OACL' and
 #           ('ACL10' or 'ACL50') and '10k_FLOWS' and
 #           'IP4FWD' and
 #           'OACL' and
 #           ('ACL10' or 'ACL50') and '10k_FLOWS' and
@@ -11688,20 +9818,20 @@
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-ndr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
-#           '1T1C' and
+#           '2T1C' and
 #           'IP4FWD' and
 #           'OACL' and
 #           ('ACL10' or 'ACL50') and '10k_FLOWS' and
 #           'IP4FWD' and
 #           'OACL' and
 #           ('ACL10' or 'ACL50') and '10k_FLOWS' and
@@ -11721,20 +9851,20 @@
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#    title: "ip4-3n-skx-x710-64b-2t1c-features-oacl-pdr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
-#           '2T2C' and
+#           '4T2C' and
 #           'IP4FWD' and
 #           'OACL' and
 #           ('ACL10' or 'ACL50') and '10k_FLOWS' and
 #           'IP4FWD' and
 #           'OACL' and
 #           ('ACL10' or 'ACL50') and '10k_FLOWS' and
@@ -11754,20 +9884,20 @@
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-ndr"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
 #    layout: "plot-throughput"
 #
 #-
 #  type: "plot"
-#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
 #  algorithm: "plot_performance_box"
 #  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
 #  filter: "'NIC_Intel-X710' and
 #           '64B' and
 #           'NDRPDR' and
-#           '2T2C' and
+#           '4T2C' and
 #           'IP4FWD' and
 #           'OACL' and
 #           ('ACL10' or 'ACL50') and '10k_FLOWS' and
 #           'IP4FWD' and
 #           'OACL' and
 #           ('ACL10' or 'ACL50') and '10k_FLOWS' and
@@ -11787,155 +9917,22 @@
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
 #    boxpoints: "outliers"
 #    whiskerwidth: 0
 #  layout:
-#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#    title: "ip4-3n-skx-x710-64b-4t2c-features-oacl-pdr"
 #    layout: "plot-throughput"
 
 #    layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-           'NDRPDR' and
-           '2T1C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
-           'NDRPDR' and
-           '4T2C' and
-           'IP4FWD' and
-           not 'IPSEC' and
-           not 'VHOST'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-  sort:
-  - "DOT1Q"
-  - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
+# Packet Throughput - VPP IPv4 3n-hsw-xl710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -11944,31 +9941,30 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -11977,31 +9973,30 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -12010,31 +10005,30 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
-           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
@@ -12043,34 +10037,34 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "DOT1Q"
   - "IP4BASE"
   - "IP4BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
+# Packet Throughput - VPP IPv4 3n-skx-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -12078,28 +10072,32 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
+           '2T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -12107,28 +10105,32 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+    title: "ip4-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -12136,28 +10138,32 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'IP4BASE' and
+           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
+           '4T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            'IP4FWD' and
            not 'IPSEC' and
+           not 'DOT1Q' and
            not 'VHOST'"
   parameters:
   - "throughput"
            not 'VHOST'"
   parameters:
   - "throughput"
@@ -12165,819 +10171,857 @@
   - "tags"
   sort:
   - "IP4BASE"
   - "tags"
   sort:
   - "IP4BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-## Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '1T1C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
-#    layout: "plot-throughput"
-#
-#-
-#  type: "plot"
-#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#  data: "plot-vpp-throughput-latency-3n-hsw"
-#  filter: "'NIC_Intel-X520-DA2' and
-#           '64B' and
-#           'ENCAP' and
-#           'NDRPDR' and
-#           '2T2C' and
-#           ('VXLAN' or 'LISP') and
-#           not 'VHOST' and
-#           not 'IPSECHW'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  - "tags"
-#  sort:
-#  - "not DOT1Q"
-#  - "VXLAN_1"
-#  - "VXLAN_10"
-#  - "VXLAN_100"
-#  - "VXLAN_1000"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
-#    layout: "plot-throughput"
-
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
+# Packet Throughput - VPP IPv4 3n-skx-x710 features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-2t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-2t1c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
+    title: "ip4-3n-skx-x710-64b-2t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+  title: "VPP Throughput: ip4-3n-skx-x710-64b-4t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-skx-x710-64b-4t2c-features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '64B' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            ('NAT44' and 'BASE') or
+            ('ACL_STATELESS' and 'ACL10' and '10k_FLOWS')) and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "DOT1Q"
+  - "IP4BASE"
+  - "NAT44"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACL"
+  - "OACL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
+    title: "ip4-3n-skx-x710-64b-4t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 base and scale
+# Packet Throughput - VPP IPv4 3n-skx-x710 features nat44
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-nat44-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           ('NAT44' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "BASE"
+  - "SRC_USER_10"
+  - "SRC_USER_100"
+  - "SRC_USER_1000"
+  - "SRC_USER_2000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-nat44-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 - features
+# Packet Throughput - VPP IPv4 3n-skx-x710 features iacl
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'ENCAP' and
-           'NDRPDR' and
-           '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
+    title: "ip4-3n-hsw-x710-64b-1t1c-features-iacl-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           '2T2C' and
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
-           not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           ('IACL' and ('ACL10' or 'ACL50') and '10k_FLOWS' or 'IP4BASE') and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
+  - "ACL_STATELESS"
+  - "ACL_STATEFUL"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
+    title: "ip4-3n-hsw-x710-64b-2t2c-features-iacl-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
+## Packet Throughput - VPP IPv4 3n-skx-x710 features oacl
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-1t1c-features-oacl-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP4FWD' and
+#           'OACL' and
+#           ('ACL10' or 'ACL50') and '10k_FLOWS' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  - "ACL_STATELESS"
+#  - "ACL_STATEFUL"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4-3n-hsw-x710-64b-2t2c-features-oacl-pdr"
+#    layout: "plot-throughput"
+
+# Packet Throughput - VPP IPv4 2n-skx-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-X710' and
            '64B' and
   filter: "'NIC_Intel-X710' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' or 'LISP') and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'DOT1Q' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "LISP"
-  - "VXLAN_1"
-  - "VXLAN_10"
-  - "VXLAN_100"
-  - "VXLAN_1000"
+  - "IP4BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
+# Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'NDRPDR' and
            '2T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           '2T1C' and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           '4T2C' and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
            '64B' and
            '64B' and
-           'ENCAP' and
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'NDRPDR' and
            '4T2C' and
-           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') and
+           'IP4FWD' and
+           not 'IPSEC' and
            not 'DOT1Q' and
            not 'DOT1Q' and
-           not 'VHOST' and
-           not 'IPSECHW'"
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "L2BDMACLRN"
-  - "L2XCFWD"
-  - "LISP"
+  - "IP4BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv6 3n-hsw-x520
+# Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '64B' and
+           'IP4BASE' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -12985,32 +11029,28 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-1t1c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '64B' and
+           'IP4BASE' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13018,32 +11058,28 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '64B' and
+           'IP4BASE' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13051,32 +11087,28 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-2t2c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '64B' and
+           'IP4BASE' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
+           'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
            not 'IPSEC' and
            not 'VHOST'"
   parameters:
@@ -13084,723 +11116,838 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-x520 - features
+################################################################################
+
+## Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 base and scale
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '1T1C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'ENCAP' and
+#           'NDRPDR' and
+#           '2T2C' and
+#           ('VXLAN' or 'LISP') and
+#           not 'VHOST' and
+#           not 'IPSECHW'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not DOT1Q"
+#  - "VXLAN_1"
+#  - "VXLAN_10"
+#  - "VXLAN_100"
+#  - "VXLAN_1000"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x520 - features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+    title: "ip4tun-3n-hsw-x520-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+    title: "ip4tun-3n-hsw-x520-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-x710
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-x710 - features
+# Packet Throughput - VPP IPv4 tunnels 3n-hsw-x710 - features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           ('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP' or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '1T1C' and
            'NDRPDR' and
            '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
+    title: "ip4tun-3n-hsw-x710-64b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
+  title: "VPP Throughput: ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T2C' and
            'NDRPDR' and
            '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
+    title: "ip4tun-3n-hsw-x710-64b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-hsw-xl710
+# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 base and scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           ('VXLAN' or 'LISP' or 'IP4BASE' and not 'DOT1Q') and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "LISP"
+  - "VXLAN_1"
+  - "VXLAN_10"
+  - "VXLAN_100"
+  - "VXLAN_1000"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-x710
+# Packet Throughput - VPP IPv4 tunnels 3n-skx-x710 - features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '2T1C' and
            'NDRPDR' and
            '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '4T2C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           '2T1C' and
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "ip4tun-3n-skx-x710-64b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
   data: "plot-vpp-throughput-latency-3n-skx"
   filter: "'NIC_Intel-X710' and
-           '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           '64B' and
+           'ENCAP' and
            'NDRPDR' and
            '4T2C' and
            'NDRPDR' and
            '4T2C' and
-           'IP6FWD' and
-           not 'SRv6' and
-           not 'IPSEC' and
-           not 'VHOST'"
+           (('VXLAN' and ('L2BDMACLRN' or 'L2XCFWD') or 'LISP') or 'IP4BASE') and
+           not 'DOT1Q' and
+           not 'VHOST' and
+           not 'IPSECHW'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "IP4BASE"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "LISP"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+    title: "ip4tun-3n-skx-x710-64b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 3n-skx-x710 - features
+################################################################################
+
+# Packet Throughput - VPP IPv6 3n-hsw-x520
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -13811,32 +11958,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
+           '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -13847,32 +11991,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -13883,32 +12024,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X520-DA2' and
            '78B' and
            '78B' and
-           ('IP6BASE' or
-            'POLICE_MARK' or
-            'COPWHLIST' or
-            'IACLDST') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -13919,30 +12057,175 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "POLICE_MARK"
-  - "COPWHLIST"
-  - "IACLDST"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-x710
+## Packet Throughput - VPP IPv6 3n-hsw-x520 - features
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
+#           'NDRPDR' and
+#           '1T1C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '78B' and
+#           ('IP6BASE' or
+#            'POLICE_MARK' or
+#            'COPWHLIST' or
+#            'IACLDST') and
+#           'NDRPDR' and
+#           '2T2C' and
+#           'IP6FWD' and
+#           not 'SRv6' and
+#           not 'IPSEC' and
+#           not 'VHOST'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "IP6BASE"
+#  - "POLICE_MARK"
+#  - "COPWHLIST"
+#  - "IACLDST"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr"
+#    layout: "plot-throughput"
+
+# Packet Throughput - VPP IPv6 3n-hsw-x710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
   filter: "'NIC_Intel-X710' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -13953,29 +12236,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
   filter: "'NIC_Intel-X710' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -13986,29 +12269,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
   filter: "'NIC_Intel-X710' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -14019,29 +12302,29 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X710' and
            '78B' and
   filter: "'NIC_Intel-X710' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -14052,30 +12335,33 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
+  - "FIB_20K"
+  - "FIB_200K"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-skx-xxv710
+# Packet Throughput - VPP IPv6 3n-hsw-x710 - features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -14086,29 +12372,32 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T1C' and
+           '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -14119,29 +12408,32 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
+           '1T1C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -14152,29 +12444,32 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+    title: "ip6-3n-hsw-x710-78b-1t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
@@ -14185,28 +12480,28 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20k"
-  - "FIB_200k"
-  - "FIB_2M"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+    title: "ip6-3n-hsw-x710-78b-2t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv6 2n-dnv-x553 base
+# Packet Throughput - VPP IPv6 3n-hsw-xl710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
@@ -14219,24 +12514,27 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
@@ -14249,24 +12547,27 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+    title: "ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
@@ -14279,24 +12580,27 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
-  data: "intel-dnv-vpp"
-  filter: "'NIC_Intel-X553' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-hsw"
+  filter: "'NIC_Intel-XL710' and
            '78B' and
            '78B' and
-           'IP6BASE' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
@@ -14309,1410 +12613,1526 @@
   - "tags"
   sort:
   - "IP6BASE"
   - "tags"
   sort:
   - "IP6BASE"
+  - "FIB_20K"
+  - "FIB_200K"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+    title: "ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
+# Packet Throughput - VPP IPv6 3n-skx-x710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           'ENCAP' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           'LISP' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           'ENCAP' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           'LISP' and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           'ENCAP' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           'LISP' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
            '78B' and
            '78B' and
-           'ENCAP' and
+           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           'LISP' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "IP4UNRLAY"
-  - "IP6UNRLAY"
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
+# Packet Throughput - VPP IPv6 3n-skx-x710 - features
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            'NDRPDR' and
-           'BASE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "ip6-3n-skx-x710-78b-2t1c-base_and_features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
+  data: "plot-vpp-throughput-latency-3n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or
+            'POLICE_MARK' or
+            'COPWHLIST' or
+            'IACLDST') and
            'NDRPDR' and
            'NDRPDR' and
-           'BASE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "POLICE_MARK"
+  - "COPWHLIST"
+  - "IACLDST"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "ip6-3n-skx-x710-78b-4t2c-base_and_features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
+# Packet Throughput - VPP IPv6 2n-skx-x710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           'SCALE' and
-           '1T1C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
+    title: "ip6-2n-skx-x710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+  title: "VPP Throughput: ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           'SCALE' and
-           '2T2C' and
-           'IPSECHW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
+    title: "ip6-2n-skx-x710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
+# Packet Throughput - VPP IPv6 2n-skx-xxv710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '1T1C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '2T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
+    title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'IP4FWD' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  data: "plot-vpp-throughput-latency-2n-skx"
+  filter: "'NIC_Intel-XXV710' and
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            'NDRPDR' and
-           '2T2C' and
-           'IPSECSW' and
-           ('IPSECTRAN' or 'IPSECTUN') and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
            not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-################################################################################
-
-# Packet Throughput - VPP SRv6 3n-hsw-x520
+# Packet Throughput - VPP IPv6 2n-dnv-x553 base
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '78B' and
            '78B' and
-           'FEATURE' and
+           'IP6BASE' and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
-           'SRv6'"
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
+    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '78B' and
            '78B' and
-           'FEATURE' and
+           'IP6BASE' and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
            'NDRPDR' and
            '1T1C' and
            'IP6FWD' and
-           'SRv6'"
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
+    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '78B' and
            '78B' and
-           'FEATURE' and
+           'IP6BASE' and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
-           'SRv6'"
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
+    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-2t2c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '78B' and
            '78B' and
-           'FEATURE' and
+           'IP6BASE' and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
            'NDRPDR' and
            '2T2C' and
            'IP6FWD' and
-           'SRv6'"
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
+  sort:
+  - "IP6BASE"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
+    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
     layout: "plot-throughput"
 
 ################################################################################
 
     layout: "plot-throughput"
 
 ################################################################################
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-x520
+# Packet Throughput - VPP IPv6 tunnels 3n-hsw-x520
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
            '1T1C' and
            '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '1T1C' and
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T2C' and
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' and
-           '64B' and
+           '78B' and
+           'ENCAP' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
            '2T2C' and
            '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'LISP' and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
+  - "IP4UNRLAY"
+  - "IP6UNRLAY"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520
+################################################################################
+
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 base
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '1T1C' and
            '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'BASE' and
+           '1T1C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'BASE' and
+           '2T2C' and
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'BASE' and
            '2T2C' and
            '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  - "throughput"
+  - "parent"
+  - "tags"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 scale
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
+           'SCALE' and
            '1T1C' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
+           'SCALE' and
            '1T1C' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
+           'SCALE' and
            '2T2C' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           'BASE' and
+           'SCALE' and
            '2T2C' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           'IPSECHW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
+# Packet Throughput - VPP IPSec 3n-hsw-xl710 SW
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            '1T1C' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            '1T1C' and
            '1T1C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-1t1c-sw-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            '2T2C' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+  title: "VPP Throughput: ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X520-DA2' and
+  filter: "'NIC_Intel-XL710' and
            '64B' and
            '64B' and
+           'IP4FWD' and
            'NDRPDR' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
            '2T2C' and
            '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not 'LBOND'"
+           'IPSECSW' and
+           ('IPSECTRAN' or 'IPSECTUN') and
+           not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
+    title: "ipsec-3n-hsw-xl710-64b-2t2c-sw-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-x710
+################################################################################
+
+# Packet Throughput - VPP SRv6 3n-hsw-x520
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
            '1T1C' and
            '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-1t1c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-1t1c-features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '1T1C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "srv6-3n-hsw-x520-78b-1t1c-features-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
-           '1T1C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           '2T2C' and
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: srv6-3n-hsw-x520-78b-2t2c-features-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/srv6-3n-hsw-x520-78b-2t2c-features-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
+  filter: "'NIC_Intel-X520-DA2' and
+           '78B' and
+           'FEATURE' and
            'NDRPDR' and
            'NDRPDR' and
-           'ETH' and
-           'IP4FWD' and
            '2T2C' and
            '2T2C' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'DOT1Q'"
+           'IP6FWD' and
+           'SRv6'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-  sort:
-  - "not CFS_OPT"
-  - "1VM"
-  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "srv6-3n-hsw-x520-78b-2t2c-features-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710
+################################################################################
+
+# Packet Throughput - VPP vhost ip4 3n-hsw-x520
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '1T1C' and
            '1T1C' and
-           'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '2T2C' and
            '2T2C' and
-           'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '1T1C' and
            '1T1C' and
-           'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+    title: "vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            '64B' and
            'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
+           'ETH' and
+           'IP4FWD' and
            '2T2C' and
            '2T2C' and
-           'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
+           not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "not CFS_OPT"
+  - "1VM"
+  - "2VM"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+    title: "vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
+## Packet Throughput - VPP vhost l2sw 3n-hsw-x520
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X520-DA2' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -15727,27 +14147,29 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -15762,27 +14184,29 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -15797,27 +14221,29 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -15832,28 +14258,30 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x520 - base vm
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -15861,6 +14289,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
@@ -15878,17 +14307,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -15896,6 +14325,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
@@ -15913,17 +14343,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-1t1c-base-vm-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -15931,6 +14361,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
@@ -15948,17 +14379,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-X710' and
+  filter: "'NIC_Intel-X520-DA2' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -15966,6 +14397,7 @@
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
+           not 'DOT1Q' and
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'LBOND'"
@@ -15983,18 +14415,18 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x520-64b-2t2c-base-vm-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost ip4 3n-hsw-xl710
+# Packet Throughput - VPP vhost ip4 3n-hsw-x710
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'ETH' and
            '64B' and
            'NDRPDR' and
            'ETH' and
@@ -16002,13 +14434,13 @@
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -16016,17 +14448,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'ETH' and
            '64B' and
            'NDRPDR' and
            'ETH' and
@@ -16034,13 +14466,13 @@
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -16048,17 +14480,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'ETH' and
            '64B' and
            'NDRPDR' and
            'ETH' and
@@ -16066,13 +14498,13 @@
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '1T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -16080,17 +14512,17 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+    title: "vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            'ETH' and
            '64B' and
            'NDRPDR' and
            'ETH' and
@@ -16098,13 +14530,13 @@
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '2T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -16112,128 +14544,165 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+    title: "vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP vhost l2sw 3n-hsw-x710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
 
 
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
+           'BASE' and
            '1T1C' and
            '1T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           'L2BDMACLRN' and
+           ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
@@ -16242,29 +14711,29 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -16279,32 +14748,34 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            'BASE' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            'BASE' and
-           '1T1C' and
+           '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
@@ -16314,27 +14785,29 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -16349,63 +14822,67 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
+# Packet Throughput - VPP vhost l2sw 3n-hsw-x710 - base vm
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           'BASE' and
-           '2T2C' and
+           '1T1C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
+           not 'CFS_OPT' and
            not 'VXLAN' and
            not 'IP4FWD' and
            not 'VXLAN' and
            not 'IP4FWD' and
-           not '2VM'"
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-ndr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base vm
 -
   type: "plot"
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -16414,66 +14891,72 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-1t1c-base-vm-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
-           '1T1C' and
+           '2T2C' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+  title: "VPP Throughput: vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
+  filter: "'NIC_Intel-X710' and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
            '64B' and
            'NDRPDR' and
            ('ETH' or 'DOT1Q') and
@@ -16482,57 +14965,574 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
-           not 'IP4FWD'"
+           not 'IP4FWD' and
+           not 'LBOND'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+    title: "vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr"
     layout: "plot-throughput"
 
     layout: "plot-throughput"
 
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-  data: "plot-vpp-throughput-latency-3n-hsw"
-  filter: "'NIC_Intel-XL710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T2C' and
-           ('L2BDMACLRN' or 'L2XCFWD') and
-           'VHOST_1024' and
-           not 'CFS_OPT' and
-           not 'VXLAN' and
-           not 'IP4FWD'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
+## Packet Throughput - VPP vhost ip4 3n-hsw-xl710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '1T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not CFS_OPT"
+#  - "1VM"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '1T1C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
 #  sort:
 #  sort:
+#  - "not CFS_OPT"
 #  - "1VM"
 #  - "1VM"
-#  - "L2XCFWD"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           'ETH' and
+#           'IP4FWD' and
+#           '2T2C' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'DOT1Q'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+#  sort:
+#  - "not CFS_OPT"
 #  - "1VM"
 #  - "1VM"
-#  - "L2BDMACLRN"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
-    layout: "plot-throughput"
+#  - "2VM"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+
+## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           'BASE' and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "not CFS_OPT"
+##  - "L2XCFWD"
+##  - "not CFS_OPT"
+##  - "CFS_OPT"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-pdr"
+#    layout: "plot-throughput"
+#
+## Packet Throughput - VPP vhost l2sw 3n-hsw-xl710 - base vm
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '1T1C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-1t1c-base-vm-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+#  data: "plot-vpp-throughput-latency-3n-hsw"
+#  filter: "'NIC_Intel-XL710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T2C' and
+#           ('L2BDMACLRN' or 'L2XCFWD') and
+#           'VHOST_1024' and
+#           not 'CFS_OPT' and
+#           not 'VXLAN' and
+#           not 'IP4FWD'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "1VM"
+##  - "L2XCFWD"
+##  - "1VM"
+##  - "L2BDMACLRN"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-hsw-xl710-64b-2t2c-base-vm-pdr"
+#    layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost ip4 3n-skx-x710
 -
 
 # Packet Throughput - VPP vhost ip4 3n-skx-x710
 -
@@ -16556,7 +15556,6 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -16588,7 +15587,6 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -16620,7 +15618,6 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -16652,7 +15649,6 @@
   - "parent"
   - "tags"
   sort:
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -16663,146 +15659,146 @@
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 3n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-3n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP vhost l2sw 3n-skx-x710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-3n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
 -
 
 # Packet Throughput - VPP vhost l2sw 3n-skx-x710 - base
 -
@@ -16828,11 +15824,11 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -16864,11 +15860,11 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -16900,11 +15896,11 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -16936,11 +15932,11 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "not CFS_OPT"
-#  - "L2XCFWD"
-#  - "not CFS_OPT"
-#  - "CFS_OPT"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -16972,11 +15968,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -17007,11 +16005,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -17042,11 +16042,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -17077,11 +16079,13 @@
   - "throughput"
   - "parent"
   - "tags"
   - "throughput"
   - "parent"
   - "tags"
-#  sort:
-#  - "1VM"
-#  - "L2XCFWD"
-#  - "1VM"
-#  - "L2BDMACLRN"
+  sort:
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2BDMACLRN"
+  - "L2XCFWD"
+  - "L2XCFWD"
+  - "L2XCFWD"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
@@ -17107,13 +16111,13 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -17140,13 +16144,13 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -17173,13 +16177,13 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -17206,13 +16210,13 @@
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            'VHOST_1024' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -17223,150 +16227,150 @@
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 2n-skx-x710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-X710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'NF_DENSITY' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP vhost l2sw 2n-skx-x710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-X710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'NF_DENSITY' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
 -
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-x710 - base
 -
@@ -17531,6 +16535,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -17566,6 +16571,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -17601,6 +16607,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -17636,6 +16643,7 @@
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            not 'NF_DENSITY' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -17670,13 +16678,13 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -17702,13 +16710,13 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -17734,13 +16742,13 @@
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -17766,13 +16774,13 @@
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'CFS_OPT' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
            not 'DOT1Q'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
-  - "not CFS_OPT"
   - "1VM"
   - "2VM"
   traces:
   - "1VM"
   - "2VM"
   traces:
@@ -17783,146 +16791,146 @@
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
     title: "vhost-ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP vhost l2sw 2n-skx-xxv710
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '2T1C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
-    layout: "plot-throughput"
-
--
-  type: "plot"
-  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  algorithm: "plot_performance_box"
-  output-file-type: ".html"
-  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-  data: "plot-vpp-throughput-latency-2n-skx"
-  filter: "'NIC_Intel-XXV710' and
-           '64B' and
-           'NDRPDR' and
-           ('ETH' or 'DOT1Q') and
-           '4T2C' and
-           'L2BDMACLRN' and
-           'VHOST_1024' and
-           not 'VXLAN' and
-           not 'IP4FWD' and
-           not '2VM'"
-  parameters:
-  - "throughput"
-  - "parent"
-  - "tags"
-#  sort:
-#  - "VM"  # "not CFS_OPT"
-#  - "CFS_OPT"
-#  - "FIB_10K"
-#  - "FIB_100K"
-#  - "FIB_1M"
-  traces:
-    hoverinfo: "x+y"
-    boxpoints: "outliers"
-    whiskerwidth: 0
-  layout:
-    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
-    layout: "plot-throughput"
+## Packet Throughput - VPP vhost l2sw 2n-skx-xxv710
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '2T1C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+#    layout: "plot-throughput"
+#
+#-
+#  type: "plot"
+#  title: "VPP Throughput: vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#  algorithm: "plot_performance_box"
+#  output-file-type: ".html"
+#  output-file: "{DIR[STATIC,VPP]}/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#  data: "plot-vpp-throughput-latency-2n-skx"
+#  filter: "'NIC_Intel-XXV710' and
+#           '64B' and
+#           'NDRPDR' and
+#           ('ETH' or 'DOT1Q') and
+#           '4T2C' and
+#           'L2BDMACLRN' and
+#           'VHOST_1024' and
+#           not 'VXLAN' and
+#           not 'IP4FWD' and
+#           not '2VM'"
+#  parameters:
+#  - "throughput"
+#  - "parent"
+#  - "tags"
+##  sort:
+##  - "VM"  # "not CFS_OPT"
+##  - "CFS_OPT"
+##  - "FIB_10K"
+##  - "FIB_100K"
+##  - "FIB_1M"
+#  traces:
+#    hoverinfo: "x+y"
+#    boxpoints: "outliers"
+#    whiskerwidth: 0
+#  layout:
+#    title: "vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+#    layout: "plot-throughput"
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
 -
 
 # Packet Throughput - VPP vhost l2sw 2n-skx-xxv710 - base
 -
@@ -18082,6 +17090,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -18116,6 +17125,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -18150,6 +17160,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -18184,6 +17195,7 @@
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'DOT1Q' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            not 'IP4FWD'"
   parameters:
   - "throughput"
@@ -20722,6 +19734,7 @@
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"
@@ -20751,6 +19764,7 @@
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"
@@ -20781,6 +19795,7 @@
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"
@@ -20810,6 +19825,7 @@
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"
@@ -20840,6 +19856,7 @@
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
            '1T1C' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"
@@ -20869,6 +19886,7 @@
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
            '2T2C' and
            'L2XCFWD' and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"
@@ -20899,6 +19917,7 @@
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '1T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"
@@ -20928,6 +19947,7 @@
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
            '2T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN') and
            not 'VHOST' and
+           not 'NF_DENSITY' and
            'MEMIF'"
   parameters:
   - "latency"
            'MEMIF'"
   parameters:
   - "latency"
Integration tests