Report: Add data
[csit.git] / resources / tools / presentation / specification.yaml
index f71da18..db075b7 100644 (file)
     DIR[DTC,PERF,VPP,3N,HSW]: "{DIR[DTC]}/vpp_performance_configuration_3n_hsw"
     DIR[DTC,PERF,VPP,3N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_3n_skx"
     DIR[DTC,PERF,VPP,2N,SKX]: "{DIR[DTC]}/vpp_performance_configuration_2n_skx"
+    DIR[DTC,PERF,VPP,2N,DNV]: "{DIR[DTC]}/vpp_performance_configuration_2n_dnv"
     DIR[DTC,MRR,VPP,3N,HSW]: "{DIR[DTC]}/vpp_mrr_configuration_3n_hsw"
     DIR[DTC,MRR,VPP,3N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_3n_skx"
     DIR[DTC,MRR,VPP,2N,SKX]: "{DIR[DTC]}/vpp_mrr_configuration_2n_skx"
+    DIR[DTC,MRR,VPP,2N,DNV]: "{DIR[DTC]}/vpp_mrr_configuration_2n_dnv"
     DIR[DTC,FUNC,VPP,UBUNTU]: "{DIR[DTC]}/vpp_functional_configuration_ubuntu"
     DIR[DTC,FUNC,VPP,CENTOS]: "{DIR[DTC]}/vpp_functional_configuration_centos"
     DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]: "{DIR[DTC]}/vpp_device_configuration_ubuntu"
@@ -64,6 +66,7 @@
     DIR[DTO,PERF,VPP,3N,HSW]: "{DIR[DTO]}/vpp_performance_operational_data_3n_hsw"
     DIR[DTO,PERF,VPP,3N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_3n_skx"
     DIR[DTO,PERF,VPP,2N,SKX]: "{DIR[DTO]}/vpp_performance_operational_data_2n_skx"
+    DIR[DTO,PERF,VPP,2N,DNV]: "{DIR[DTO]}/vpp_performance_operational_data_2n_dnv"
 
     # .css patch file to fix tables generated by Sphinx
     DIR[CSS_PATCH_FILE]: "{DIR[STATIC]}/theme_overrides.css"
@@ -72,8 +75,8 @@
   urls:
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[JENKINS,HC]: "https://jenkins.fd.io/view/hc2vpp/job"
-    # URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/intel_denverton_vpp_release_1810.tar.gz"
     URL[VIRL,DNV]: "http://10.30.51.28/download/denverton/1810/robot-plugin.zip"
+    # URL[VIRL,DNV]: "http://download.it/from/nexus"
     URL[NEXUS]: "https://docs.fd.io/csit"
     DIR[NEXUS]: "report/_static/archive"
 
   limits:
     nic:
       x520: 24460000
+      x553: 29761905
       x710: 35800000
       xxv710: 35800000
       xl710: 35800000
 
     # Denverton:
     intel-dnv-vpp:
+      # TODO: Replace with new data
       intel-dnv-vpp-release-1810:
       - 1
 
     # VPP Performance
     vpp-performance-changes-3n-hsw:
-      csit-vpp-perf-1804-all:
-      - 21  # sel
-      - 22  # sel
-      - 23  # sel
-      - 24  # sel
-      - 27  # sel
-      - 28  # sel
-      - 29  # sel
-      - 30  # sel
-      - 31  # sel
-      - 35  # sel
       csit-vpp-perf-verify-1807-3n-hsw:
       - 11  # NDRPDR full 1
       - 22  # NDRPDR full 2
       - 39  # NDRPDR sel
       - 41  # NDRPDR sel
       - 42  # NDRPDR sel
+      # 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
+
+    vpp-nic-comparison-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
 
     vpp-performance-changes-3n-skx:
       csit-vpp-perf-verify-1807-3n-skx:
       - 21  # NDRPDR sel
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
+      # TODO Add new 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
+
+    vpp-nic-comparison-3n-skx:
+      # TODO: Add new 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
 
     vpp-performance-changes-2n-skx:
       csit-vpp-perf-verify-1807-2n-skx:
       - 23  # NDRPDR sel
       - 24  # NDRPDR sel
       - 27  # NDRPDR sel
+      # TODO Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
 
-    vpp-compare-testbeds:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 8   # NDRPDR sel
+    vpp-nic-comparison-2n-skx:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
       - 12  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 18  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
       - 23  # NDRPDR sel
-      - 25  # NDRPDR sel
-      - 38  # NDRPDR sel
-      - 39  # NDRPDR sel
-      - 41  # NDRPDR sel
-      - 42  # NDRPDR sel
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 24  # NDRPDR full
+
+    vpp-compare-testbeds:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel F
+      - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     vpp-compare-testbeds-mrr:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
 
     vpp-compare-topologies:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
       - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
+      - 16  # NDRPDR sel fails
       - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
 
     vpp-compare-topologies-mrr:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 22  # MRR sel
 
     vpp-performance-changes-3n-hsw-mrr:
-      csit-vpp-perf-check-1804:
-      - 6   # mrr - sel
-      - 13  # mrr - sel
-      - 14  # mrr - sel
-      - 15  # mrr - sel
-      - 16  # mrr - sel
-      - 17  # mrr - sel
-      - 19  # mrr - sel
-      - 20  # mrr - sel
-      - 21  # mrr - sel
-      - 22  # mrr - sel
       csit-vpp-perf-verify-1807-3n-hsw:
       - 8   # MRR full
       - 9   # MRR sel
       - 48  # MRR sel
       csit-vpp-perf-verify-1810-3n-hsw:
       - 9   # MRR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+
+    vpp-nic-comparison-3n-hsw-mrr:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
 
     vpp-performance-changes-3n-skx-mrr:
       csit-vpp-perf-verify-1807-3n-skx:
       - 11  # MRR sel
       - 12  # MRR sel
       - 13  # MRR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
+
+    vpp-nic-comparison-3n-skx-mrr:
+      # TODO: Replace with new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
 
     vpp-performance-changes-2n-skx-mrr:
       csit-vpp-perf-verify-1807-2n-skx:
       - 10  # MRR sel
       - 11  # MRR sel
       - 12  # MRR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 22  # MRR sel
+
+    vpp-nic-comparison-2n-skx-mrr:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 22  # MRR sel
 
     vpp-perf-results-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 20  # NDRPDR full
-      - 21  # NDRPDR full
-      - 22  # NDRPDR full
-      - 27  # NDRPDR full
+      # TODO: Replace with FULL data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 19  # NDRPDR sel
 
     vpp-perf-results-3n-skx:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 23  # NDRPDR full
-      - 24  # NDRPDR full
+      # TODO: Add FULL data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 37  # NDRPDR full
+      - 39  # NDRPDR full
 
     vpp-perf-results-2n-skx:
-      csit-vpp-perf-verify-1810-2n-skx:
+      # TODO: Add FULL data
+      csit-vpp-perf-verify-1901-2n-skx:
       - 25  # NDRPDR full
-      - 26  # NDRPDR full
+      - 30  # NDRPDR full
 
     vpp-mrr-results-3n-hsw:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+      # TODO: Replace with FULL data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
 
     vpp-mrr-results-3n-skx:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
+      # TODO: Replace with FULL data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
 
     vpp-mrr-results-2n-skx:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
+      # TODO: Replace with FULL data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 22  # MRR sel
 
     plot-throughput-speedup-analysis-3n-hsw:
-      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
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
+      - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
 
     plot-throughput-speedup-analysis-3n-skx:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 24  # NDRPDR full
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-throughput-speedup-analysis-2n-skx:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
       - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
+      - 16  # NDRPDR sel fails
       - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
 
     plot-vpp-throughput-latency-3n-hsw:
-      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
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
+      - 19  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
+
+    plot-vpp-soak-2n-skx:
+      # TODO: Replace with new data
+      # csit-vpp-perf-verify-1901-2n-skx:
+      csit-vpp-perf-verify-master-2n-skx:
+      - 248  # SOAK sel
+      - 251  # 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
+
+    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
 
     plot-vpp-throughput-latency-3n-skx:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 24  # NDRPDR full
-      - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
 
     plot-vpp-throughput-latency-2n-skx:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
       - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
+      - 16  # NDRPDR sel fails
       - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
       - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # 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
 
     # VPP Functional
     vpp-func-results-ubuntu:
-      csit-vpp-functional-1810-ubuntu1604-virl:
-      - 44
+      csit-vpp-functional-1901-ubuntu1604-virl:
+      - 48
 
     vpp-func-results-centos:
-      csit-vpp-functional-1810-centos7-virl:
-      - 44
+      csit-vpp-functional-1901-centos7-virl:
+      - 50
 
     vpp-device-results-ubuntu:
-      csit-vpp-device-1810-ubuntu1804-1n-skx:
-      - 2
+      csit-vpp-device-1901-ubuntu1804-1n-skx:
+      - 49
 
     # 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
 
     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
       - 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
 
     # DPDK Performance
     dpdk-performance-changes-3n-hsw:
-      csit-dpdk-perf-1804-all:
-      - 4
-      - 5
-      - 6
-      - 7
-      - 8
-      - 9
-      - 10
-      - 11
-      - 12
-      - 13
       csit-dpdk-perf-verify-1807-3n-hsw:
       - 11
       - 12  # full
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
-
-    dpdk-performance-changes-3n-skx:
-      csit-dpdk-perf-verify-1807-3n-skx:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      csit-dpdk-perf-verify-1810-3n-skx:
+
+    dpdk-performance-changes-3n-skx:
+      csit-dpdk-perf-verify-1807-3n-skx:
+      - 1   # NDRPDR sel
+      - 2   # NDRPDR sel
       - 3   # NDRPDR sel
-      - 4   # NDRPDR sel
       - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-
-    dpdk-compare-testbeds:
       csit-dpdk-perf-verify-1810-3n-skx:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 13  # NDRPDR sel
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+
+    dpdk-compare-testbeds:
+      # TODO: Replace with new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
       - 5   # NDRPDR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
 
     dpdk-compare-topologies:
-      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-1810-2n-skx:
+      # TODO: Replace with new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 2   # NDRPDR sel
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
       - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
 
     dpdk-perf-results-3n-hsw:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1
+      # TODO: Replace with FULL data
+      csit-dpdk-perf-verify-1901-3n-hsw:
+      - 6   # NDRPDR sel
 
     dpdk-perf-results-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
-      - 3   # NDRPDR sel
+      # TODO: Replace with new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 2   # NDRPDR sel F
 
     dpdk-perf-results-2n-skx:
-      csit-dpdk-perf-verify-1810-2n-skx:
-      - 3
+      # TODO: Replace with FULL data
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 2   # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-hsw:
-      csit-dpdk-perf-verify-1810-3n-hsw:
-      - 1   # NDRPDR sel
-      - 2   # NDRPDR sel
+      # TODO: Replace with new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
       - 5   # NDRPDR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
 
     plot-dpdk-throughput-latency-3n-skx:
-      csit-dpdk-perf-verify-1810-3n-skx:
+      # TODO: Replace with new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+
+    plot-dpdk-throughput-latency-2n-skx:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 2   # NDRPDR sel
       - 3   # NDRPDR sel
       - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
       - 6   # NDRPDR sel
       - 7   # NDRPDR sel
       - 8   # NDRPDR sel
       - 9   # NDRPDR sel
       - 10  # NDRPDR sel
       - 11  # NDRPDR sel
-      - 12  # NDRPDR sel
-      - 13  # NDRPDR sel
-
-    plot-dpdk-throughput-latency-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
 
     # HoneyComb Functional
     hc-func-results:
-      csit-hc2vpp-verify-func-1810-ubuntu1604:
+      csit-hc2vpp-verify-func-1901-ubuntu1604:
       - 3
 
     # NSH SFC Functional
     nsh-func-results:
+      # TODO: Replace with new data
+      # csit-nsh_sfc-verify-func-1901-ubuntu1604-virl:
       csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
       - 1
 
     # DMM Functional
     dmm-func-results:
+      # TODO: Replace with new data
+      # csit-dmm-functional-1901-ubuntu1604-virl:
       csit-dmm-functional-1810-ubuntu1604-virl:
       - 1
 
   plot-layouts:
 
+    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
+
+    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
       autosize: False
       margin:
         t: 50
-        b: 20
+        b: 0
         l: 80
         r: 20
       showlegend: True
           size: 16
         zeroline: True
         rangemode: "tozero"
-        range: [0,100]
+        range: [0,100]
       legend:
         orientation: "h"
         font:
     intel-dnv-vpp-release-1810:
     - 1
 
-    csit-vpp-perf-1804-all:
-    - 21  # sel
-    - 22  # sel
-    - 23  # sel
-    - 24  # sel
-    - 27  # sel
-    - 28  # sel
-    - 29  # sel
-    - 30  # sel
-    - 31  # sel
-    - 35  # sel
     csit-vpp-perf-verify-1807-3n-hsw:
     - 8   # MRR full
     - 9   # MRR sel
     - 35  # WRK
     - 36  # WRK
     - 37  # WRK
+    csit-vpp-perf-verify-1901-3n-hsw:
+    - 35  # MRR sel
+    - 10  # NDRPDR sel
+    - 18  # NDRPDR sel F
+    - 19  # NDRPDR sel
+    - 31  # NDRPDR sel
+    - 36  # NDRPDR sel
     csit-vpp-perf-verify-1807-3n-skx:
     - 31  # MRR full
     - 28  # MRR 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
+    - 18  # NDRPDR sel
+    - 19  # NDRPDR sel
+    - 20  # NDRPDR sel
+    - 28  # NDRPDR sel
+    - 31  # NDRPDR sel
+    - 33  # NDRPDR sel
+    - 36  # NDRPDR sel
+    - 38  # NDRPDR sel
     csit-vpp-perf-verify-1807-2n-skx:
     - 27  # MRR full
     - 31  # MRR sel
     - 23  # NDRPDR sel
     - 24  # NDRPDR sel
     - 27  # NDRPDR sel
-    csit-vpp-perf-check-1804:
-    - 5   # mrr - full
-    - 6   # mrr - sel
-    - 13  # mrr - sel
-    - 14  # mrr - sel
-    - 15  # mrr - sel
-    - 16  # mrr - sel
-    - 17  # mrr - sel
-    - 19  # mrr - sel
-    - 20  # mrr - sel
-    - 21  # mrr - sel
-    - 22  # mrr - sel
+    csit-vpp-perf-verify-1901-2n-skx:
+    - 22  # MRR sel
+    - 25  # NDRPDR full
+    - 30  # NDRPDR full
+    - 5   # NDRPDR sel
+    - 10  # NDRPDR sel fails
+    - 12  # NDRPDR sel
+    - 13  # NDRPDR sel
+    - 16  # NDRPDR sel fails
+    - 21  # NDRPDR sel
+    - 23  # NDRPDR sel
+    - 24  # NFV MRR
+    - 26  # NFV MRR
+    - 27  # NFV MRR
+    - 28  # NFV NDRPDR
+    - 29  # NFV NDRPDR
+    # - 32  # NFV NDRPDR
+    csit-vpp-perf-verify-master-2n-skx:
+    - 248  # SOAK sel
+    - 251  # SOAK sel
     csit-ligato-perf-verify-1810-3n-hsw:
     - 5   # full
     - 6   # sel
     - 16  # sel
     - 17  # sel
     - 18  # sel
-    csit-dpdk-perf-1804-all:
-    - 4
-    - 5
-    - 6
-    - 7
-    - 8
-    - 9
-    - 10
-    - 11
-    - 12
-    - 13
+    # TODO: Add new data
+    # csit-ligato-perf-verify-1901-3n-hsw:
     csit-dpdk-perf-verify-1807-3n-hsw:
     - 11
     - 12  # full
     - 8   # NDRPDR sel
     - 9   # NDRPDR sel
     - 10  # NDRPDR sel
+    csit-dpdk-perf-verify-1901-3n-hsw:
+    - 3   # NDRPDR sel
+    - 4   # NDRPDR sel
+    - 5   # NDRPDR sel
+    - 6   # NDRPDR sel
+    - 7   # NDRPDR sel
+    - 8   # NDRPDR sel
+    - 9   # NDRPDR sel
+    - 10  # NDRPDR sel
+    - 11  # NDRPDR sel
     csit-dpdk-perf-verify-1807-3n-skx:
     - 1   # NDRPDR sel
     - 2   # NDRPDR sel
     - 11  # NDRPDR sel
     - 12  # NDRPDR sel
     - 13  # NDRPDR sel
-    csit-dpdk-perf-verify-1810-2n-skx:
+    csit-dpdk-perf-verify-1901-3n-skx:
+    - 1   # NDRPDR sel
+    - 2   # 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:
+    - 2   # NDRPDR sel
     - 3   # NDRPDR sel
     - 4   # NDRPDR sel
     - 5   # NDRPDR sel
+    - 6   # NDRPDR sel
     - 7   # NDRPDR sel
     - 8   # NDRPDR sel
     - 9   # NDRPDR sel
     - 10  # NDRPDR sel
     - 11  # NDRPDR sel
-    - 12  # NDRPDR sel
-    - 13  # NDRPDR sel
-
-    csit-vpp-functional-1810-ubuntu1604-virl:
-    - 44
-    csit-vpp-functional-1810-centos7-virl:
-    - 44
-    csit-vpp-device-1810-ubuntu1804-1n-skx:
-    - 2
+    csit-vpp-functional-1901-ubuntu1604-virl:
+    - 48
+    csit-vpp-functional-1901-centos7-virl:
+    - 50
+    csit-vpp-device-1901-ubuntu1804-1n-skx:
+    - 49
     csit-nsh_sfc-verify-func-1810-ubuntu1604-virl:
     - 1
     csit-dmm-functional-1810-ubuntu1604-virl:
     - 1
-    csit-hc2vpp-verify-func-1810-ubuntu1604:
+    csit-hc2vpp-verify-func-1901-ubuntu1604:
     - 3
 
 -
   format:
     html:
     - full
-    pdf:
-    - minimal
+#    pdf:
+#    - minimal
 
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
 
-################################################################################
-# VPP
 
-# VPP Performance Changes 3n-hsw 1t1c pdr 
+# VPP Compare NICs 3n-hsw 1t1c ndr
 -
   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: "rls1804"
-      data:
-        csit-vpp-perf-1804-all:
-        - 21  # sel
-        - 22  # sel
-        - 23  # sel
-        - 24  # sel
-        - 27  # sel
-        - 28  # sel
-        - 29  # sel
-        - 30  # sel
-        - 31  # sel
-        - 35  # sel
+  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: "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
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
-    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
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    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 Performance Changes 3n-hsw 2t2c pdr
+# VPP Compare NICs 3n-hsw 2t2c ndr
 -
   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: "rls1804"
-      data:
-        csit-vpp-perf-1804-all:
-        - 21  # sel
-        - 22  # sel
-        - 23  # sel
-        - 24  # sel
-        - 27  # sel
-        - 28  # sel
-        - 29  # sel
-        - 30  # sel
-        - 31  # sel
-        - 35  # sel
+  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: "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
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
-    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
-  data: "vpp-performance-changes-3n-hsw"
+    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: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'1T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
-# VPP Performance Changes 3n-hsw 1t1c ndr
+# VPP Compare NICs 3n-hsw 2t2c pdr
 -
   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: "rls1804"
-      data:
-        csit-vpp-perf-1804-all:
-        - 21  # sel
-        - 22  # sel
-        - 23  # sel
-        - 24  # sel
-        - 27  # sel
-        - 28  # sel
-        - 29  # sel
-        - 30  # sel
-        - 31  # sel
-        - 35  # sel
+  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: "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
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
-    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
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+    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 Performance Changes 3n-hsw 2t2c ndr
+# VPP Compare NICs 3n-hsw 1t1c mrr
 -
   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: "rls1804"
-      data:
-        csit-vpp-perf-1804-all:
-        - 21  # sel
-        - 22  # sel
-        - 23  # sel
-        - 24  # sel
-        - 27  # sel
-        - 28  # sel
-        - 29  # sel
-        - 30  # sel
-        - 31  # sel
-        - 35  # 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:
-    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
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
-    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
-  data: "vpp-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'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"
-  - "throughput"
+  - "result"
+  - "tags"
 
-# VPP Performance Changes 3n-skx 2t1c pdr 
+# VPP Compare NICs 3n-hsw 2t2c mrr
 -
   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"
+  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: "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
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
-    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
-  data: "vpp-performance-changes-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'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"
-  - "throughput"
+  - "result"
+  - "tags"
 
-# VPP Performance Changes 3n-skx 4t2c pdr
+# VPP Compare NICs 3n-hsw 4t4c mrr
 -
   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"
+  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: "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
+    title: "Intel-x520"
+    nic: "NIC_Intel-X520-DA2"
   compare:
-    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
-  data: "vpp-performance-changes-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'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"
-  - "throughput"
+  - "result"
+  - "tags"
 
-# VPP Performance Changes 3n-skx 2t1c ndr
+# VPP Compare NICs 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"
+  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: "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
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
-    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
-  data: "vpp-performance-changes-3n-skx"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
-# VPP Performance Changes 3n-skx 4t2c ndr
+# VPP Compare NICs 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"
+  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: "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
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
-    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
-  data: "vpp-performance-changes-3n-skx"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
-# VPP Performance Changes 2n-skx 2t1c pdr 
+# VPP Compare NICs 3n-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"
+  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: "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
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
-    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
-  data: "vpp-performance-changes-2n-skx"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'2T1C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
-# VPP Performance Changes 2n-skx 4t2c pdr
+ # VPP Compare NICs 3n-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"
+  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: "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
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
-    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
-  data: "vpp-performance-changes-2n-skx"
+    title: "Intel-xxv710"
+    nic: "NIC_Intel-XXV710"
+  data: "vpp-nic-comparison-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  filter: "'4T2C' and 'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
+  - "tags"
 
-# VPP Performance Changes 2n-skx 2t1c ndr
+# VPP Compare NICs 3n-skx 2t1c mrr
 -
   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"
+  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: "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
+    title: "Intel-x710"
+    nic: "NIC_Intel-X710"
   compare:
-    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
-  data: "vpp-performance-changes-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'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"
-  - "throughput"
+  - "result"
+  - "tags"
 
-# VPP Performance Changes 2n-skx 4t2c ndr
+# VPP Compare NICs 3n-skx 4t2c mrr
 -
   type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c ndr"
+  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-2n-skx-4t2c-ndr"
+  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: "rls1807"
+    title: "rls1810"
     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
+      csit-vpp-perf-verify-1810-3n-hsw:
+      -   # NDRPDR sel
+      - 12  # NDRPDR sel
+      - 14  # NDRPDR sel
+      - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
+      - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
       - 39  # NDRPDR sel
-      - 40  # NDRPDR sel
+      - 41  # NDRPDR sel
       - 42  # NDRPDR sel
   compare:
-    title: "rls1810"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
-  data: "vpp-performance-changes-2n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      - 31  # NDRPDR sel
+      - 36  # 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 Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+# VPP Performance Changes 3n-hsw 2t2c pdr
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx ndr"
+  title: "VPP Performance Changes 3n-hsw 2t2c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-ndr"
+  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: "3-Node Hsw"
+    title: "rls1810"
     data:
       csit-vpp-perf-verify-1810-3n-hsw:
       - 8   # NDRPDR sel
       - 41  # NDRPDR sel
       - 42  # NDRPDR sel
   compare:
-    title: "3-Node Skx"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-3n-skx:
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR'"
+      - 31  # NDRPDR sel
+      - 36  # 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"
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+# VPP Performance Changes 3n-hsw 1t1c ndr
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx pdr"
+  title: "VPP Performance Changes 3n-hsw 1t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-pdr"
+  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: "3-Node Hsw"
+    title: "rls1810"
     data:
       csit-vpp-perf-verify-1810-3n-hsw:
       - 8   # NDRPDR sel
       - 41  # NDRPDR sel
       - 42  # NDRPDR sel
   compare:
-    title: "3-Node Skx"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-3n-skx:
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-3n-hsw:
       - 10  # NDRPDR sel
-      - 14  # NDRPDR sel
-      - 15  # NDRPDR sel
-      - 16  # NDRPDR sel
-      - 17  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 25  # NDRPDR sel
-  data: "vpp-compare-testbeds"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'NDRPDR'"
+      - 31  # NDRPDR sel
+      - 36  # 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"
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx ndr
+# VPP Performance Changes 3n-hsw 2t2c ndr
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx ndr"
+  title: "VPP Performance Changes 3n-hsw 2t2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-ndr"
+  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: "3-Node Skx"
+    title: "rls1810"
     data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 10  # NDRPDR sel
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 8   # NDRPDR sel
+      - 12  # 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
+      - 18  # NDRPDR sel
+      - 23  # NDRPDR sel
       - 25  # NDRPDR sel
+      - 38  # NDRPDR sel
+      - 39  # NDRPDR sel
+      - 41  # NDRPDR sel
+      - 42  # NDRPDR sel
   compare:
-    title: "2-Node Skx"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 10  # NDRPDR sel
+      - 18  # NDRPDR sel F
       - 19  # NDRPDR sel
-      - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
-  data: "vpp-compare-topologies"
+      - 31  # NDRPDR sel
+      - 36  # NDRPDR sel
+  data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR'"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx pdr
+# VPP Performance Changes 3n-skx 2t1c pdr
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx pdr"
+  title: "VPP Performance Changes 3n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  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: "3-Node Skx"
+    title: "rls1810"
     data:
       csit-vpp-perf-verify-1810-3n-skx:
       - 10  # NDRPDR sel
       - 22  # NDRPDR sel
       - 25  # NDRPDR sel
   compare:
-    title: "2-Node Skx"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 9   # NDRPDR sel
-      - 13  # NDRPDR sel
-      - 14  # NDRPDR sel
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 18  # NDRPDR sel
       - 19  # NDRPDR sel
       - 20  # NDRPDR sel
-      - 21  # NDRPDR sel
-      - 22  # NDRPDR sel
-      - 23  # NDRPDR sel
-      - 24  # NDRPDR sel
-      - 27  # NDRPDR sel
-  data: "vpp-compare-topologies"
+      - 28  # NDRPDR sel
+      - 31  # NDRPDR sel
+      - 33  # NDRPDR sel
+      - 36  # NDRPDR sel
+      - 38  # NDRPDR sel
+  data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR'"
+  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
   - "throughput"
 
-# VPP Performance Changes 3n-hsw 1t1c MRR
+# VPP Performance Changes 3n-skx 4t2c pdr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-hsw 1t1c MRR"
+  title: "VPP Performance Changes 3n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-1t1c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-pdr"
   history:
     -
-      title: "rls1804"
+      title: "rls1807"
       data:
-        csit-vpp-perf-check-1804:
-        - 6   # mrr - sel
-        - 13  # mrr - sel
-        - 14  # mrr - sel
-        - 15  # mrr - sel
-        - 16  # mrr - sel
-        - 17  # mrr - sel
-        - 19  # mrr - sel
-        - 20  # mrr - sel
-        - 21  # mrr - sel
-        - 22  # mrr - sel
+        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: "rls1807"
+    title: "rls1810"
     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
+      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: "rls1810"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-  data: "vpp-performance-changes-3n-hsw-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      # TODO: Add new 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
+  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"
-  - "result"
+  - "throughput"
 
-# VPP Performance Changes 3n-hsw 2t2c MRR
+# VPP Performance Changes 3n-skx 2t1c ndr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-hsw 2t2c MRR"
+  title: "VPP Performance Changes 3n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-2t2c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-ndr"
   history:
     -
-      title: "rls1804"
+      title: "rls1807"
       data:
-        csit-vpp-perf-check-1804:
-        - 6   # mrr - sel
-        - 13  # mrr - sel
-        - 14  # mrr - sel
-        - 15  # mrr - sel
-        - 16  # mrr - sel
-        - 17  # mrr - sel
-        - 19  # mrr - sel
-        - 20  # mrr - sel
-        - 21  # mrr - sel
-        - 22  # mrr - sel
+        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: "rls1807"
+    title: "rls1810"
     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
+      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: "rls1810"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-  data: "vpp-performance-changes-3n-hsw-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      # TODO: Add new 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
+  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"
-  - "result"
+  - "throughput"
 
-# VPP Performance Changes 3n-hsw 4t4c MRR
+# VPP Performance Changes 3n-skx 4t2c ndr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-hsw 4t4c MRR"
+  title: "VPP Performance Changes 3n-skx 4t2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-hsw-4t4c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-ndr"
   history:
     -
-      title: "rls1804"
+      title: "rls1807"
       data:
-        csit-vpp-perf-check-1804:
-        - 6   # mrr - sel
-        - 13  # mrr - sel
-        - 14  # mrr - sel
-        - 15  # mrr - sel
-        - 16  # mrr - sel
-        - 17  # mrr - sel
-        - 19  # mrr - sel
-        - 20  # mrr - sel
-        - 21  # mrr - sel
-        - 22  # mrr - sel
+        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: "rls1807"
+    title: "rls1810"
     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
+      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: "rls1810"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
-  data: "vpp-performance-changes-3n-hsw-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      # TODO: Add new 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
+  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"
-  - "result"
+  - "throughput"
 
-# VPP Performance Changes 3n-skx 2t1c MRR
+# VPP Performance Changes 2n-skx 2t1c pdr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 2t1c MRR"
+  title: "VPP Performance Changes 2n-skx 2t1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-2t1c-mrr"
+  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: "rls1807"
+    title: "rls1810"
     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
+      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: "rls1810"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
-  data: "vpp-performance-changes-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # 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"
-  - "result"
+  - "throughput"
 
-# VPP Performance Changes 3n-skx 4t2c MRR
+# VPP Performance Changes 2n-skx 4t2c pdr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 4t2c MRR"
+  title: "VPP Performance Changes 2n-skx 4t2c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-4t2c-mrr"
+  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: "rls1807"
+    title: "rls1810"
     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
+      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: "rls1810"
+    title: "rls1901"
     data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
-  data: "vpp-performance-changes-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # 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"
-  - "result"
+  - "throughput"
 
-# VPP Performance Changes 3n-skx 8t4c MRR
+# VPP Performance Changes 2n-skx 2t1c ndr
 -
   type: "table"
-  title: "VPP Performance Changes 3n-skx 8t4c MRR"
+  title: "VPP Performance Changes 2n-skx 2t1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-3n-skx-8t4c-mrr"
+  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: "rls1807"
+    title: "rls1810"
     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
+      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:
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # 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-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
-  data: "vpp-performance-changes-3n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      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:
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # 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"
-  - "result"
+  - "throughput"
 
-# VPP Performance Changes 2n-skx 2t1c MRR
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr
 -
   type: "table"
-  title: "VPP Performance Changes 2n-skx 2t1c MRR"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-2t1c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr"
   reference:
-    title: "rls1807"
+    title: "3-Node Hsw"
     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
+      # 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
   compare:
-    title: "rls1810"
+    title: "3-Node Skx"
     data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-  data: "vpp-performance-changes-2n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      # TODO: Add new 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
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
 
-# VPP Performance Changes 2n-skx 4t2c MRR
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr
 -
   type: "table"
-  title: "VPP Performance Changes 2n-skx 4t2c MRR"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c ndr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-4t2c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr"
   reference:
-    title: "rls1807"
+    title: "3-Node Hsw"
     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
+      # 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
   compare:
-    title: "rls1810"
+    title: "3-Node Skx"
     data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-  data: "vpp-performance-changes-2n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      # TODO: Add new 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
+  data: "vpp-compare-testbeds"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
 
-# VPP Performance Changes 2n-skx 8t4c MRR
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr
 -
   type: "table"
-  title: "VPP Performance Changes 2n-skx 8t4c MRR"
+  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c pdr"
   algorithm: "table_performance_comparison"
-  output-file: "{DIR[STATIC,VPP]}/performance-changes-2n-skx-8t4c-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-1c-pdr"
   reference:
-    title: "rls1807"
+    title: "3-Node Hsw"
     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
+      # 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
   compare:
-    title: "rls1810"
+    title: "3-Node Skx"
     data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-  data: "vpp-performance-changes-2n-skx-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+      # TODO: Add new 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
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '1C'"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
 
-# VPP Comparison Across Testbeds 3n-hsw to 3n-skx mrr
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c pdr
 -
   type: "table"
-  title: "VPP Comparison Across Testbeds 3n-hsw to 3n-skx 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-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-testbeds-3n-hsw-3n-skx-2c-pdr"
   reference:
     title: "3-Node Hsw"
     data:
-      csit-vpp-perf-verify-1810-3n-hsw:
-      - 9   # MRR sel
+      # 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
   compare:
     title: "3-Node Skx"
     data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
-  data: "vpp-compare-testbeds-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and 'MRR'"
+      # TODO: Add new 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
+  data: "vpp-compare-testbeds"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NIC_Intel-X710' and 'NDRPDR' and '2C'"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
 
-# VPP Comparison Across Topologies 3n-skx to 2n-skx mrr
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c ndr
 -
   type: "table"
-  title: "VPP Comparison Across Topologies 3n-skx to 2n-skx 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-mrr"
+  output-file: "{DIR[STATIC,VPP]}/performance-compare-topologies-3n-skx-2n-skx-1c-ndr"
   reference:
     title: "3-Node Skx"
     data:
-      csit-vpp-perf-verify-1810-3n-skx:
-      - 9   # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-      - 13  # MRR sel
+      # TODO: Add new 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
   compare:
     title: "2-Node Skx"
     data:
-      csit-vpp-perf-verify-1810-2n-skx:
-      - 8   # MRR sel
-      - 10  # MRR sel
-      - 11  # MRR sel
-      - 12  # MRR sel
-  data: "vpp-compare-topologies-mrr"
-  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'MRR'"
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+  data: "vpp-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '1C'"
   parameters:
   - "name"
   - "parent"
-  - "result"
+  - "throughput"
 
-# Detailed Test Results - VPP Performance Results 3n-hsw
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c ndr
 -
   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: "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:
+      # TODO: Add new 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
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+  data: "vpp-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '2C'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
-# Detailed Test Results - VPP Performance Results 3n-skx
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c pdr
 -
   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 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:
+      # TODO: Add new 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
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+  data: "vpp-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '1C'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
-# Detailed Test Results - VPP Performance Results 2n-skx
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c pdr
 -
   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 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:
+      # TODO: Add new 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
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new data:
+      csit-vpp-perf-verify-1901-2n-skx:
+      - 5   # NDRPDR sel
+      - 10  # NDRPDR sel fails
+      - 12  # NDRPDR sel
+      - 13  # NDRPDR sel
+      - 16  # NDRPDR sel fails
+      - 21  # NDRPDR sel
+      - 23  # NDRPDR sel
+  data: "vpp-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR' and '2C'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "throughput"
 
-# Detailed Test Results - VPP Performance Results 2n-dnv
+# VPP Performance Changes 3n-hsw 1t1c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 9   # MRR sel
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+  data: "vpp-performance-changes-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "result"
 
-# Test configuration - VPP Performance Test Configs 3n-hsw
+# VPP Performance Changes 3n-hsw 2t2c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 9   # MRR sel
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+  data: "vpp-performance-changes-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
-  - "parent"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "result"
 
-# Test configuration - VPP Performance Test Configs 3n-skx
+# VPP Performance Changes 3n-hsw 4t4c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-hsw:
+      - 9   # MRR sel
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+  data: "vpp-performance-changes-3n-hsw-mrr"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
-  - "parent"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "result"
 
-# Test configuration - VPP Performance Test Configs 2n-skx
+# VPP Performance Changes 3n-skx 2t1c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new 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'"
   parameters:
-  - "parent"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "result"
 
-# Test Operational Data - VPP Performance Operational Data 3n-hsw
+# VPP Performance Changes 3n-skx 4t2c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new 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'"
   parameters:
-  - "parent"
   - "name"
-  - "show-run"
+  - "parent"
+  - "result"
 
-# Test Operational Data - VPP Performance Operational Data 3n-skx
+# VPP Performance Changes 3n-skx 8t4c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-3n-skx:
+      - 9   # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+      - 13  # MRR sel
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new 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'"
   parameters:
-  - "parent"
   - "name"
-  - "show-run"
+  - "parent"
+  - "result"
 
-# Test Operational Data - VPP Performance Operational Data 2n-skx
+# VPP Performance Changes 2n-skx 2t1c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+  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"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T1C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
-  - "parent"
   - "name"
-  - "show-run"
+  - "parent"
+  - "result"
 
-# Detailed Test Results - VPP MRR Results 3n-hsw
+# VPP Performance Changes 2n-skx 4t2c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+  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"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'4T2C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "result"
 
-# Detailed Test Results - VPP MRR Results 3n-skx
+# VPP Performance Changes 2n-skx 8t4c MRR
 -
   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 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
+  reference:
+    title: "rls1810"
+    data:
+      csit-vpp-perf-verify-1810-2n-skx:
+      - 8   # MRR sel
+      - 10  # MRR sel
+      - 11  # MRR sel
+      - 12  # MRR sel
+  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"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  filter: "'8T4C' and 'MRR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "result"
 
-# Detailed Test Results - VPP MRR Results 2n-skx
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 1c mrr
 -
   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 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:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new 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'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "result"
 
-# Detailed Test Results - VPP MRR Results 2n-dnv
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 2c mrr
 -
   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 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:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new 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'"
   parameters:
   - "name"
   - "parent"
-  - "msg"
+  - "result"
 
-# Test configuration - VPP MRR Test Configs 3n-hsw
+# VPP Comparison Across Testbeds 3n-hsw to 3n-skx 4c mrr
 -
   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 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:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-hsw:
+      - 35  # MRR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new 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'"
   parameters:
+  - "name"
   - "parent"
+  - "result"
+
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 1c mrr
+-
+  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"
+  reference:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new 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'"
+  parameters:
   - "name"
-  - "vat-history"
+  - "parent"
+  - "result"
 
-# Test configuration - VPP MRR Test Configs 3n-skx
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 2c mrr
 -
   type: "table"
-  title: "Test configuration - VPP MRR Test Configs 3n-skx"
-  algorithm: "table_details"
+  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"
+  reference:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new 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 '2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+
+# VPP Comparison Across Topologies 3n-skx to 2n-skx 4c mrr
+-
+  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"
+  reference:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-vpp-perf-verify-1901-3n-skx:
+      - 32  # MRR sel
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new 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[DTC,MRR,VPP,3N,SKX]}/vpp_mrr_test_configuration_3n_skx"
+  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
   columns:
   -
     title: "Name"
     data: "data name"
   -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+    title: "Status"
+    data: "data msg"
   rows: "generated"
-  data: "vpp-mrr-results-3n-skx"
-  filter: "'MRR'"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
-  - "parent"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "msg"
 
-# Test configuration - VPP MRR Test Configs 2n-skx
+# Detailed Test Results - VPP Performance Results 3n-skx
 -
   type: "table"
-  title: "Test configuration - VPP MRR Test Configs 2n-skx"
-  algorithm: "table_details"
+  title: "Detailed Test Results - VPP Performance Results 3n-skx"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,MRR,VPP,2N,SKX]}/vpp_mrr_test_configuration_2n_skx"
+  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
   columns:
   -
     title: "Name"
     data: "data name"
   -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+    title: "Status"
+    data: "data msg"
   rows: "generated"
-  data: "vpp-mrr-results-2n-skx"
-  filter: "'MRR'"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
-  - "parent"
   - "name"
-  - "vat-history"
+  - "parent"
+  - "msg"
 
-# Detailed Test Results - VPP Functional Results - Ubuntu
+# Detailed Test Results - VPP Performance Results 2n-skx
 -
   type: "table"
-  title: "Detailed Test Results - VPP Functional Results - Ubuntu"
-  algorithm: "table_details"
+  title: "Detailed Test Results - VPP Performance Results 2n-skx"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,VPP,UBUNTU]}/vpp_functional_results_ubuntu"
+  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
   columns:
   -
     title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
   -
     title: "Status"
-    data: "data status"
+    data: "data msg"
   rows: "generated"
-  data: "vpp-func-results-ubuntu"
-  filter: "all"
+  data: "vpp-perf-results-2n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "name"
   - "parent"
-  - "doc"
-  - "status"
+  - "msg"
 
-# Detailed Test Results - VPP Functional Results - CentOS
+# Detailed Test Results - VPP Performance Results 2n-dnv
 -
   type: "table"
-  title: "Detailed Test Results - VPP Functional Results - CentOS"
+  title: "Detailed Test Results - VPP Performance Results 2n-dnv"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,VPP,CENTOS]}/vpp_functional_results_centos"
+  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
   columns:
   -
     title: "Name"
     data: "data name"
-  -
-    title: "Documentation"
-    data: "data doc"
   -
     title: "Status"
-    data: "data status"
+    data: "data msg"
   rows: "generated"
-  data:
-    "vpp-func-results-centos"
-  filter: "all"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
   parameters:
   - "name"
   - "parent"
-  - "doc"
-  - "status"
+  - "msg"
 
-# Test configuration - VPP Functional Test Configs - Ubuntu
+# Test configuration - VPP Performance Test Configs 3n-hsw
 -
   type: "table"
-  title: "Test configuration - VPP Functional Test Configs - Ubuntu"
-  algorithm: "table_details"
+  title: "Test configuration - VPP Performance Test Configs 3n-hsw"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,FUNC,VPP,UBUNTU]}/vpp_functional_configuration_ubuntu"
+  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_test_configuration_3n_hsw"
   columns:
   -
     title: "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"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
   - "vat-history"
 
-# Test configuration - VPP Functional Test Configs - CentOS
+# Test configuration - VPP Performance Test Configs 3n-skx
 -
   type: "table"
-  title: "Test configuration - VPP Functional Test Configs - CentOS"
-  algorithm: "table_details"
+  title: "Test configuration - VPP Performance Test Configs 3n-skx"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,FUNC,VPP,CENTOS]}/vpp_functional_configuration_centos"
+  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_test_configuration_3n_skx"
   columns:
   -
     title: "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"
+  data: "vpp-perf-results-3n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
   - "vat-history"
 
-# Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw
+# Test configuration - VPP Performance Test Configs 2n-skx
 -
   type: "table"
-  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results 3n-hsw"
-  algorithm: "table_details"
+  title: "Test configuration - VPP Performance Test Configs 2n-skx"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,PERF,COT,3N,HSW]}/cot_performance_results_3n_hsw"
+  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_test_configuration_2n_skx"
   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"
-  data: "ligato-perf-results-3n-hsw"
-  filter: "all"
+  data: "vpp-perf-results-2n-skx"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
-  - "name"
   - "parent"
-  - "msg"
+  - "name"
+  - "vat-history"
 
-# Detailed Test Results - VPP Device Results - Ubuntu
+# Test configuration - VPP Performance Test Configs 2n-dnv
 -
   type: "table"
-  title: "Detailed Test Results - VPP Device Results - Ubuntu"
+  title: "Test configuration - VPP Performance Test Configs 2n-dnv"
   algorithm: "table_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTR,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_results_ubuntu"
+  output-file: "{DIR[DTC,PERF,VPP,2N,DNV]}/vpp_test_configuration_2n_dnv"
   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"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
+  data: "intel-dnv-vpp"
+  filter: "'NDRPDR'"
   parameters:
-  - "name"
   - "parent"
-  - "doc"
-  - "status"
+  - "name"
+  - "vat-history"
 
-# Test configuration - VPP Device Test Configs - Ubuntu
+# Test Operational Data - VPP Performance Operational Data 3n-hsw
 -
   type: "table"
-  title: "Test configuration - VPP Device Test Configs - Ubuntu"
-  algorithm: "table_details"
+  title: "Test Operational Data - VPP Performance Operational Data 3n-hsw"
+  algorithm: "table_merged_details"
   output-file-ext: ".csv"
-  output-file: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}/vpp_device_configuration_ubuntu"
+  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_test_operational_3n_hsw"
   columns:
   -
     title: "Name"
     data: "data name"
   -
-    title: "VPP API Test (VAT) Commands History - Commands Used Per Test Case"
-    data: "data vat-history"
+    title: "VPP Operational Data - Outputs of 'show runtime' at NDR packet rate"
+    data: "data show-run"
   rows: "generated"
-  data: "vpp-device-results-ubuntu"
-  filter: "all"
+  data: "vpp-perf-results-3n-hsw"
+  filter: "not 'NDRCHK' and not 'PDRCHK'"
   parameters:
   - "parent"
   - "name"
-  - "vat-history"
+  - "show-run"
 
-################################################################################
+# Test Operational Data - VPP Performance Operational Data 3n-skx
+-
+  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'"
+  parameters:
+  - "parent"
+  - "name"
+  - "show-run"
 
-# DPDK Performance Changes 3n-hsw 1t1c pdr
+# Test Operational Data - VPP Performance Operational Data 2n-skx
 -
   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: "rls1804"
-      data:
-        csit-dpdk-perf-1804-all:
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
-  reference:
-    title: "rls1807"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-  compare:
-    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: "dpdk-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' 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:
+  - "parent"
   - "name"
+  - "show-run"
+
+# Test Operational Data - VPP Performance Operational Data 2n-dnv
+-
+  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'"
+  parameters:
   - "parent"
-  - "throughput"
+  - "name"
+  - "show-run"
 
-# DPDK Performance Changes 3n-hsw 2t2c pdr
+# Detailed Test Results - VPP MRR Results 3n-hsw
 -
   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: "rls1804"
-      data:
-        csit-dpdk-perf-1804-all:
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
-  reference:
-    title: "rls1807"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-  compare:
-    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: "dpdk-performance-changes-3n-hsw"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' 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"
-  - "throughput"
+  - "msg"
 
-# DPDK Performance Changes 3n-hsw 1t1c ndr
+# Detailed Test Results - VPP MRR Results 3n-skx
 -
   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: "rls1804"
-      data:
-        csit-dpdk-perf-1804-all:
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
-  reference:
-    title: "rls1807"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-  compare:
-    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: "dpdk-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' 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"
+  - "msg"
+
+# Detailed Test Results - VPP MRR Results 2n-skx
+-
+  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'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - VPP MRR Results 2n-dnv
+-
+  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'"
+  parameters:
+  - "name"
+  - "parent"
+  - "msg"
+
+# Test configuration - VPP MRR Test Configs 3n-hsw
+-
+  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'"
+  parameters:
+  - "parent"
+  - "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"
+  - "name"
+  - "vat-history"
+
+# Test configuration - VPP MRR Test Configs 2n-skx
+-
+  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'"
+  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"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data: "vpp-func-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
+
+# Detailed Test Results - VPP Functional Results - CentOS
+-
+  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"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
+
+# Test configuration - VPP Functional Test Configs - Ubuntu
+-
+  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"
+  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"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
+
+# Test configuration - VPP Device Test Configs - Ubuntu
+-
+  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"
+  parameters:
+  - "parent"
+  - "name"
+  - "vat-history"
+
+################################################################################
+
+# DPDK Performance Changes 3n-hsw 1t1c pdr
+-
+  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:
+        csit-dpdk-perf-verify-1807-3n-hsw:
+        - 11
+        - 12  # full
+        - 14
+        - 15
+        - 16
+        - 17
+        - 20
+        - 21
+        - 22
+        - 23
+  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
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-hsw 2t2c pdr
+-
+  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:
+        csit-dpdk-perf-verify-1807-3n-hsw:
+        - 11
+        - 12  # full
+        - 14
+        - 15
+        - 16
+        - 17
+        - 20
+        - 21
+        - 22
+        - 23
+  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
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-hsw 1t1c ndr
+-
+  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:
+        csit-dpdk-perf-verify-1807-3n-hsw:
+        - 11
+        - 12  # full
+        - 14
+        - 15
+        - 16
+        - 17
+        - 20
+        - 21
+        - 22
+        - 23
+  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
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'1T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-hsw 2t2c ndr
+-
+  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:
+        csit-dpdk-perf-verify-1807-3n-hsw:
+        - 11
+        - 12  # full
+        - 14
+        - 15
+        - 16
+        - 17
+        - 20
+        - 21
+        - 22
+        - 23
+  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
+  compare:
+    title: "rls1901"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  data: "dpdk-performance-changes-3n-hsw"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Performance Changes 3n-skx 2t1c pdr
+-
+  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:
+        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:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  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:
+        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:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  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:
+        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:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  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:
+        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:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  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:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  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 Topologies 3n-skx to 2n-skx ndr
+-
+  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:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  data: "dpdk-compare-topologies"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "throughput"
+
+# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
+-
+  type: "table"
+  title: "DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr"
+  algorithm: "table_performance_comparison"
+  output-file: "{DIR[STATIC,DPDK]}/performance-compare-topologies-3n-skx-2n-skx-pdr"
+  reference:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  compare:
+    title: "2-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-2n-skx:
+      - 2   # NDRPDR sel
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  data: "dpdk-compare-topologies"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  filter: "'NDRPDR'" # "('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:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-hsw:
+      - 3   # NDRPDR sel
+      - 4   # NDRPDR sel
+      - 5   # NDRPDR sel
+      - 6   # NDRPDR sel
+      - 7   # NDRPDR sel
+      - 8   # NDRPDR sel
+      - 9   # NDRPDR sel
+      - 10  # NDRPDR sel
+      - 11  # NDRPDR sel
+  compare:
+    title: "3-Node Skx"
+    data:
+      # TODO: Add new data
+      csit-dpdk-perf-verify-1901-3n-skx:
+      - 1   # NDRPDR sel F
+      - 2   # NDRPDR sel F
+  data: "dpdk-compare-testbeds"
+  include-tests: "PDR" # "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 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"
+
+# Detailed Test Results - DPDK Performance Results 3n-hsw
+-
+  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"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 3n-skx
+-
+  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"
+  - "parent"
+  - "msg"
+
+# Detailed Test Results - DPDK Performance Results 2n-skx
+-
+  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"
+  - "parent"
+  - "msg"
+
+################################################################################
+# HoneyComb
+-
+  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"
+  - "parent"
+  - "doc"
+  - "status"
+
+################################################################################
+# NSH SFC
+-
+  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"
+  - "parent"
+  - "doc"
+  - "status"
+
+################################################################################
+# DMM
+-
+  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"
+  - "parent"
+  - "doc"
+  - "status"
+
+################################################################################
+###                                F I L E S                                 ###
+################################################################################
+
+# VPP Performance Results 3n-hsw
+-
+  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'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Results 3n-skx
+-
+  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'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Results 2n-skx
+-
+  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'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Results 2n-dnv
+-
+  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'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Configuration 3n-hsw
+-
+  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'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Configuration 3n-skx
+-
+  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'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Configuration 2n-skx
+-
+  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'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Configuration 2n-dnv
+-
+  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'"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
+
+# VPP Performance Operational Data 3n-hsw
+-
+  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'"
   parameters:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Performance Changes 3n-hsw 2t2c ndr
+# VPP Performance Operational Data 3n-skx
 -
-  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: "rls1804"
-      data:
-        csit-dpdk-perf-1804-all:
-        - 4
-        - 5
-        - 6
-        - 7
-        - 8
-        - 9
-        - 10
-        - 11
-        - 12
-        - 13
-  reference:
-    title: "rls1807"
-    data:
-      csit-dpdk-perf-verify-1807-3n-hsw:
-      - 11
-      - 12  # full
-      - 14
-      - 15
-      - 16
-      - 17
-      - 20
-      - 21
-      - 22
-      - 23
-  compare:
-    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: "dpdk-performance-changes-3n-hsw"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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'"
   parameters:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Performance Changes 3n-skx 2t1c pdr
+# VPP Performance Operational Data 2n-skx
 -
-  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"
-  reference:
-    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
-  compare:
-    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
-  data: "dpdk-performance-changes-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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'"
   parameters:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Performance Changes 3n-skx 4t2c pdr
+# VPP Performance Operational Data 2n-dnv
 -
-  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"
-  reference:
-    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
-  compare:
-    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
-  data: "dpdk-performance-changes-3n-skx"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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'"
   parameters:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Performance Changes 3n-skx 2t1c ndr
+# VPP MRR Results 3n-hsw
 -
-  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"
-  reference:
-    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
-  compare:
-    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
-  data: "dpdk-performance-changes-3n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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'"
   parameters:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Performance Changes 3n-skx 4t2c ndr
+# VPP MRR Results 3n-skx
 -
-  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"
-  reference:
-    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
-  compare:
-    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
-  data: "dpdk-performance-changes-3n-skx"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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'"
   parameters:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx ndr
+# VPP MRR Results 2n-skx
 -
-  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-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
-  compare:
-    title: "3-Node Skx"
-    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
-  data: "dpdk-compare-testbeds"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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"
+  filter: "all"
   parameters:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx ndr
+# VPP MRR Results 2n-dnv
 -
-  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-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: "2-Node Skx"
-    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
-  data: "dpdk-compare-topologies"
-  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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'"
   parameters:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Comparison Across Topologies 3n-skx to 2n-skx pdr
+# VPP MRR Configuration 3n-hsw
 -
-  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-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: "2-Node Skx"
-    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
-  data: "dpdk-compare-topologies"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NDRPDR'" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# DPDK Comparison Across Testbeds 3n-hsw to 3n-skx pdr
+# VPP MRR Configuration 3n-skx
 -
-  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-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
-  compare:
-    title: "3-Node Skx"
-    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
-  data: "dpdk-compare-testbeds"
-  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'NIC_Intel-X710' and ('NDRPDR' or 'NDRPDRDISC')" # "('NDRPDR' or 'NDRPDRDISC')" | "'MRR'"
+  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:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "throughput"
+  data-start-level: 3
 
-# 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"
+# VPP MRR Configuration 2n-skx
+-
+  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:
+  - "name"
+  - "doc"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
-# Detailed Test Results - DPDK Performance Results 3n-hsw
+# VPP MRR Configuration 2n-dnv
 -
-  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"
+  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:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "msg"
+  data-start-level: 3
 
-# Detailed Test Results - DPDK Performance Results 3n-skx
+# VPP Functional Results - Ubuntu
 -
-  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"
+  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:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "msg"
+  data-start-level: 3
 
-# Detailed Test Results - DPDK Performance Results 2n-skx
+# VPP Functional Results - CentOS
 -
-  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"
+  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:
   - "name"
+  - "doc"
+  - "level"
   - "parent"
-  - "msg"
+  data-start-level: 3
 
-################################################################################
-# HoneyComb
+# VPP Functional Configuration - Ubuntu
 -
-  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"
+  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:
   - "name"
-  - "parent"
   - "doc"
-  - "status"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
-################################################################################
-# NSH SFC
+# VPP Functional Configuration - CentOS
 -
-  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"
+  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:
-    "nsh-func-results"
+    "vpp-func-results-centos"
   filter: "all"
   parameters:
   - "name"
-  - "parent"
   - "doc"
-  - "status"
+  - "level"
+  - "parent"
+  data-start-level: 3
 
-################################################################################
-# DMM
+# VPP Device Results - Ubuntu
 -
-  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"
+  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:
   - "name"
-  - "parent"
   - "doc"
-  - "status"
-
-################################################################################
-###                                F I L E S                                 ###
-################################################################################
+  - "level"
+  - "parent"
+  data-start-level: 2
 
-# VPP Performance Results 3n-hsw
+# VPP Device Configuration - Ubuntu
 -
   type: "file"
-  title: "VPP Performance Results 3n-hsw"
+  title: "VPP Device Configuration - Ubuntu"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,HSW]}/vpp_performance_results_3n_hsw"
+  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[DTR,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  dir-tables: "{DIR[DTC,FUNC,VPP,DEVICE,UBUNTU]}"
+  data: "vpp-device-results-ubuntu"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 3
+  data-start-level: 2
 
-# VPP Performance Results 3n-skx
+# Container Orchestrated Performance Results 3n-hsw
 -
   type: "file"
-  title: "VPP Performance Results 3n-skx"
+  title: "Container Orchestrated Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,3N,SKX]}/vpp_performance_results_3n_skx"
+  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,VPP,3N,SKX]}"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  dir-tables: "{DIR[DTR,PERF,COT,3N,HSW]}"
+  data: "ligato-perf-results-3n-hsw"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Results 2n-skx
+# DPDK Performance Results 3n-hsw
 -
   type: "file"
-  title: "VPP Performance Results 2n-skx"
+  title: "DPDK Performance Results 3n-hsw"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,2N,SKX]}/vpp_performance_results_2n_skx"
+  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,VPP,2N,SKX]}"
-  data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,HSW]}"
+  data: "dpdk-perf-results-3n-hsw"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Results 2n-dnv
+# DPDK Performance Results 3n-skx
 -
   type: "file"
-  title: "VPP Performance Results 2n-dnv"
+  title: "DPDK Performance Results 3n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTR,PERF,VPP,2N,DNV]}/vpp_performance_results_2n_dnv"
+  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,VPP,2N,DNV]}"
-  data: "intel-dnv-vpp"
-  filter: "'NDRPDR'"
+  dir-tables: "{DIR[DTR,PERF,DPDK,3N,SKX]}"
+  data: "dpdk-perf-results-3n-skx"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Configuration 3n-hsw
+# DPDK Performance Results 2n-skx
 -
   type: "file"
-  title: "VPP Performance Configuration 3n-hsw"
+  title: "DPDK Performance Results 2n-skx"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,3N,HSW]}/vpp_performance_configuration_3n_hsw"
+  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[DTC,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  dir-tables: "{DIR[DTR,PERF,DPDK,2N,SKX]}"
+  data: "dpdk-perf-results-2n-skx"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Configuration 3n-skx
+# Honeycomb Functional Results
 -
   type: "file"
-  title: "VPP Performance Configuration 3n-skx"
+  title: "Honeycomb Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,3N,SKX]}/vpp_performance_configuration_3n_skx"
+  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[DTC,PERF,VPP,3N,SKX]}"
-  data: "vpp-perf-results-3n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  dir-tables: "{DIR[DTR,FUNC,HC]}"
+  data:
+    "hc-func-results"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Configuration 2n-skx
+# NSH SFC Functional Results
 -
   type: "file"
-  title: "VPP Performance Configuration 2n-skx"
+  title: "NSH SFC Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTC,PERF,VPP,2N,SKX]}/vpp_performance_configuration_2n_skx"
+  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[DTC,PERF,VPP,2N,SKX]}"
-  data: "vpp-perf-results-2n-skx"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  dir-tables: "{DIR[DTR,FUNC,NSHSFC]}"
+  data:
+    "nsh-func-results"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Operational Data 3n-hsw
+# DMM Functional Results
 -
   type: "file"
-  title: "VPP Performance Operational Data 3n-hsw"
+  title: "DMM Functional Results"
   algorithm: "file_test_results"
   output-file-ext: ".rst"
-  output-file: "{DIR[DTO,PERF,VPP,3N,HSW]}/vpp_performance_operational_data_3n_hsw"
+  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[DTO,PERF,VPP,3N,HSW]}"
-  data: "vpp-perf-results-3n-hsw"
-  filter: "not 'NDRCHK' and not 'PDRCHK'"
+  dir-tables: "{DIR[DTR,FUNC,DMM]}"
+  data:
+    "dmm-func-results"
+  filter: "all"
   parameters:
   - "name"
   - "doc"
   - "parent"
   data-start-level: 3
 
-# VPP Performance Operational Data 3n-skx
+################################################################################
+###                                P L O T S                                 ###
+################################################################################
+
+# Soak test - 30min Soak Test (PLRsearch), boxes
 -
-  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: "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"
+
+-
+  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'"
+  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"
+
+-
+  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'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    layout: "plot-service-density"
+
+-
+  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'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-ndr"
+    layout: "plot-service-density"
+
+-
+  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'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  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'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  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'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+-
+  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'"
+  parameters:
+  - "throughput"
+  - "name"
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = VNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}vhost-{Y}chain-{XY}vm-l3fwdip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots - NF Density - CSC
+
+-
+  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'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
+
+-
+  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'"
+  parameters:
+  - "result"
+  - "name"
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{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"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# VPP Performance Operational Data 2n-skx
 -
-  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: "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'"
   parameters:
+  - "result"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# VPP MRR Results 3n-hsw
 -
-  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: "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'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# VPP MRR Results 3n-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: "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"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# VPP MRR Results 2n-skx
 -
-  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"
-  filter: "all"
+  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'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# VPP MRR Results 2n-dnv
 -
-  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: "all"
+  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'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# VPP MRR Configuration 3n-hsw
 -
-  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: "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'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# VPP MRR Configuration 3n-skx
 -
-  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'"
+  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'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# VPP MRR Configuration 2n-skx
 -
-  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'"
+  type: "plot"
+  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: "{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"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
-# VPP Functional Results - Ubuntu
 -
-  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"
+  type: "plot"
+  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: "{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"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Chain"
+  y-axis: "Y = Number of Service Chains"
+  z-axis: "IMIX Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2XY}memif-{Y}chain-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
+
+################################################################################
+# Plots - NF Density - CSP
 
-# VPP Functional Results - CentOS
 -
-  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"
+  type: "plot"
+  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: "{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
+           '2T1C' and
+           'MRR'"
   parameters:
+  - "result"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
-# VPP Functional Configuration - Ubuntu
 -
-  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"
+  type: "plot"
+  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: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'MRR'"
   parameters:
+  - "result"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
-# 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"
+  type: "plot"
+  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: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '2T1C' and
+           'MRR'"
   parameters:
+  - "result"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
-# VPP Device Results - Ubuntu
 -
-  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"
+  type: "plot"
+  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: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-mrr"
+  data: "plot-vpp-nfv-2n-skx-mrr"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           'IMIX' and
+           '4T2C' and
+           'MRR'"
   parameters:
+  - "result"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 2
+  - "tags"
+  include-tests: "MRR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean MRR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-mrr"
+    layout: "plot-service-density"
 
-# VPP Device Configuration - Ubuntu
 -
-  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"
+  type: "plot"
+  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: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 2
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
-# Container Orchestrated Performance Results 3n-hsw
 -
-  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"
+  type: "plot"
+  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: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-4t2c-base-csp-ndr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '4T2C' and
+           'NDRPDR'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
-# DPDK Performance Results 3n-hsw
 -
-  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"
+  type: "plot"
+  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: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-2t1c-base-csp-ndr"
+  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"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
-# DPDK Performance Results 3n-skx
 -
-  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"
+  type: "plot"
+  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: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-imix-4t2c-base-csp-ndr"
+  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"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "IMIX Packet Throughput (mean NDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-ndr"
+    layout: "plot-service-density"
 
-# DPDK Performance Results 2n-skx
 -
-  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"
+  type: "plot"
+  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: "{DIR[STATIC,VPP]}/l2bd-2n-skx-x710-64b-2t1c-base-csp-pdr"
+  data: "plot-vpp-nfv-2n-skx"
+  filter: "'NIC_Intel-X710' and
+           'NF_DENSITY' and
+           'DOCKER' and
+           'PIPELINE' and
+           '64B' and
+           '2T1C' and
+           'NDRPDR'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
-# Honeycomb Functional Results
 -
-  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"
+  type: "plot"
+  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: "{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
+           '4T2C' and
+           'NDRPDR'"
   parameters:
+  - "throughput"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "tags"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  x-axis: "X = CNFs per Service Pipeline"
+  y-axis: "Y = Number of Service Pipelines"
+  z-axis: "64B Packet Throughput (mean PDR) [Mpps]"
+  layout:
+    title: "<b>Throughput:</b> eth-l2bd-{2Y}memif-{Y}pipe-{XY}drc-vppip4-pdr"
+    layout: "plot-service-density"
 
-# NSH SFC Functional Results
 -
-  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"
+  type: "plot"
+  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: "{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"
   - "name"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
+  - "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"
 
-# DMM Functional Results
 -
-  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"
+  type: "plot"
+  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: "{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"
-  - "doc"
-  - "level"
-  - "parent"
-  data-start-level: 3
-
-################################################################################
-###                                P L O T S                                 ###
-################################################################################
+  - "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
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
     title: "l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
+# Packet Throughput - VPP L2 2n-dnv-x553 base
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+  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
+           '64B' and
+           'BASE' and
+           'NDRPDR' and
+           'ETH' and
+           '1T1C' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-2n-dnv-x553-64b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+  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
+           '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'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-2n-dnv-x553-64b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+  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
+           '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'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-2n-dnv-x553-64b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+  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
+           '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'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "l2sw-2n-dnv-x553-64b-2t2c-base-pdr"
+    layout: "plot-throughput"
+
 ################################################################################
 
 # Packet Throughput - VPP Container Memif 3n-hsw-x520
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' 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
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' 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
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' 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
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' 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
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   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
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-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"
+  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
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  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
+           '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-xxv710-64b-2t1c-base_and_scale-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-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"
+  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-X710' and
+  filter: "'NIC_Intel-XXV710' 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
            '2T1C' and
            'IP4FWD' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "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"
+    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-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"
+  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-X710' and
+  filter: "'NIC_Intel-XXV710' 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
            '4T2C' and
            'IP4FWD' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "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"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-x710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-skx-xxv710-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"
+  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-X710' and
+  filter: "'NIC_Intel-XXV710' 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
            '4T2C' and
            'IP4FWD' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "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"
+    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
     layout: "plot-throughput"
 
-# Packet Throughput - VPP IPv4 2n-skx-xxv710 base and scale
+# Packet Throughput - VPP IPv4 2n-dnv-x553 base and scale
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-ndr"
   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-2n-dnv-x553-64b-1t1c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'IP4BASE' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
+    title: "ip4-2n-dnv-x553-64b-1t1c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-dnv-x553-64b-1t1c-base-pdr"
   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-2n-dnv-x553-64b-1t1c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'IP4BASE' and
            'NDRPDR' and
-           '2T1C' and
+           '1T1C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-pdr"
+    title: "ip4-2n-dnv-x553-64b-1t1c-base-pdr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-ndr"
   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-2n-dnv-x553-64b-2t2c-base-ndr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'IP4BASE' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
+    title: "ip4-2n-dnv-x553-64b-2t2c-base-ndr"
     layout: "plot-throughput"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip4-2n-dnv-x553-64b-2t2c-base-pdr"
   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-2n-dnv-x553-64b-2t2c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '64B' and
-           ('IP4BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'IP4BASE' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP4FWD' and
            not 'IPSEC' and
            not 'VHOST'"
   - "tags"
   sort:
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-pdr"
+    title: "ip4-2n-dnv-x553-64b-2t2c-base-pdr"
     layout: "plot-throughput"
 
 ################################################################################
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
   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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   traces:
     hoverinfo: "x+y"
 
 -
   type: "plot"
-  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  title: "VPP Throughput: ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+  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
+           '78B' and
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
+           'NDRPDR' and
+           '4T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  - "FIB_20k"
+  - "FIB_200k"
+  - "FIB_2M"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+    layout: "plot-throughput"
+
+# Packet Throughput - VPP IPv6 2n-dnv-x553 base
+-
+  type: "plot"
+  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+  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
+           '78B' and
+           'IP6BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip6-2n-dnv-x553-78b-1t1c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+  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
+           '78B' and
+           'IP6BASE' and
+           'NDRPDR' and
+           '1T1C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip6-2n-dnv-x553-78b-1t1c-base-pdr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+  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
+           '78B' and
+           'IP6BASE' and
+           'NDRPDR' and
+           '2T2C' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "ip6-2n-dnv-x553-78b-2t2c-base-ndr"
+    layout: "plot-throughput"
+
+-
+  type: "plot"
+  title: "VPP Throughput: ip6-2n-dnv-x553-78b-2t2c-base-pdr"
   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-2n-dnv-x553-78b-2t2c-base-pdr"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
            '78B' and
-           ('IP6BASE' or 'FIB_20K' or 'FIB_200K' or 'FIB_2M') and
+           'IP6BASE' and
            'NDRPDR' and
-           '4T2C' and
+           '2T2C' and
            'IP6FWD' and
            not 'SRv6' and
            not 'IPSEC' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
-  - "FIB_2M"
   traces:
     hoverinfo: "x+y"
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-pdr"
+    title: "ip6-2n-dnv-x553-78b-2t2c-base-pdr"
     layout: "plot-throughput"
 
 ################################################################################
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "latency"
   - "parent"
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "latency"
   - "parent"
            '2T1C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "latency"
   - "parent"
            '4T2C' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "latency"
   - "parent"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' 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
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' 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
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   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
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP4FWD' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "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
+           ('IP4BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP4FWD' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' 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
            '2T1C' and
            'IP4FWD' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr"
   data: "plot-vpp-throughput-latency-2n-skx"
   filter: "'NIC_Intel-XXV710' 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
            '4T2C' and
            'IP4FWD' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr"
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            'ENCAP' and
            'NDRPDR' and
            '1T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '2T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '2T1C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            'ENCAP' and
            'NDRPDR' and
            '4T2C' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
   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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '4T2C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-x710-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
+           ('IP6BASE' or 'FIB_20k' or 'FIB_200k' or 'FIB_2M') and
            'NDRPDR' and
            '2T1C' and
            'IP6FWD' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr"
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr"
            '2T1C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "latency"
            '4T2C' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "latency"
            'VHOST_1024' and
            not 'VXLAN' and
            not 'IP4FWD' and
+           not 'NF_DENSITY' and
            not '2VM'"
   parameters:
   - "latency"
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "latency"
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "latency"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' 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
            'IP4FWD' and
            not 'IPSEC' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-base_and_scale-ndr"
   data: "plot-throughput-speedup-analysis-3n-hsw"
   filter: "'NIC_Intel-X520-DA2' 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
            'IP4FWD' and
            not 'IPSEC' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-3n-hsw-x520-64b-base_and_scale-pdr"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "NAT44"
   - "POLICE_MARK"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
   - "FIB_20K"
   - "FIB_200K"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' 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
            'IP4FWD' and
            not 'IPSEC' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-base_and_scale-ndr"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-X710' 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
            'IP4FWD' and
            not 'IPSEC' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-x710-64b-base_and_scale-pdr"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' 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
            'IP4FWD' and
            not 'IPSEC' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-xxv710-64b-base_and_scale-ndr"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' 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
            'IP4FWD' and
            not 'IPSEC' and
   - "parent"
   - "tags"
   sort:
+  - "DOT1Q"
   - "IP4BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip4-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPv4 2n-dnv-x553 base
+-
+  type: "plot"
+  title: "Speedup: ip4-2n-dnv-x553-64b-base-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-ndr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '64B' and
+           'IP4BASE' and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  layout:
+    title: "ip4-2n-dnv-x553-64b-base-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip4-2n-dnv-x553-64b-base-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip4-2n-dnv-x553-64b-base-pdr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '64B' and
+           'IP4BASE' and
+           'NDRPDR' and
+           'IP4FWD' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP4BASE"
+  layout:
+    title: "ip4-2n-dnv-x553-64b-base-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Speedup - VPP IPv4 Tunnels 3n-hsw-x520
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
            '64B' and
            'ENCAP' and
            'NDRPDR' and
-           'VXLAN' and
-           'L2BDMACLRN' and
+           ('VXLAN' or 'LISP') and
            not 'VHOST' and
            not 'IPSECHW'"
   parameters:
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
   - "parent"
   - "tags"
   sort:
-  - "not DOT1Q"
+  - "LISP"
   - "VXLAN_1"
   - "VXLAN_10"
   - "VXLAN_100"
   data: "plot-throughput-speedup-analysis-2n-skx"
   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
            'IP6FWD' and
            not 'SRv6' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-x710-78b-base_and_scale-ndr"
   data: "plot-throughput-speedup-analysis-2n-skx"
   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
            'IP6FWD' and
            not 'SRv6' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-x710-78b-base_and_scale-pdr"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' 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
            'IP6FWD' and
            not 'SRv6' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-xxv710-78b-base_and_scale-ndr"
   data: "plot-throughput-speedup-analysis-2n-skx"
   filter: "'NIC_Intel-XXV710' 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
            'IP6FWD' and
            not 'SRv6' and
   - "tags"
   sort:
   - "IP6BASE"
-  - "FIB_20K"
-  - "FIB_200K"
+  - "FIB_20k"
+  - "FIB_200k"
   - "FIB_2M"
   layout:
     title: "ip6-2n-skx-xxv710-78b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP IPv6 2n-dnv-x553 base
+-
+  type: "plot"
+  title: "Speedup: ip6-2n-dnv-x553-78b-base-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-ndr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '78B' and
+           'IP6BASE' and
+           'NDRPDR' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  layout:
+    title: "ip6-2n-dnv-x553-78b-base-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: ip6-2n-dnv-x553-78b-base-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/ip6-2n-dnv-x553-78b-base-pdr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '78B' and
+           'IP6BASE' and
+           'NDRPDR' and
+           'IP6FWD' and
+           not 'SRv6' and
+           not 'IPSEC' and
+           not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "IP6BASE"
+  layout:
+    title: "ip6-2n-dnv-x553-78b-base-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Speedup - VPP IPv6 tunnels 3n-hsw-x520
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
   - "parent"
   - "tags"
   sort:
+  - "L2XCFWD"
   - "L2PATCH"
-  - "L2XCBASE"
-  - "BASE"
+  - "L2BDMACLRN"
   - "FIB_10K"
   - "FIB_100K"
   - "FIB_1M"
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
+           not 'DRV_AVF' and
            not 'MEMIF'"
   parameters:
   - "throughput"
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
+           not 'DRV_AVF' and
            not 'MEMIF'"
   parameters:
   - "throughput"
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
            'ETH' and
            ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
            not 'VHOST' and
-           not 'MEMIF'"
+           not 'MEMIF' and
+           not 'DRV_AVF'"
   parameters:
   - "throughput"
   - "parent"
     title: "l2sw-2n-skx-xxv710-64b-base_and_scale-pdr"
     layout: "plot-throughput-speedup-analysis"
 
+# Speedup - VPP L2 2n-dnv-x553 base
+-
+  type: "plot"
+  title: "Speedup: l2sw-2n-dnv-x553-64b-base-ndr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-ndr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
+  layout:
+    title: "l2sw-2n-dnv-x553-64b-base-ndr"
+    layout: "plot-throughput-speedup-analysis"
+
+-
+  type: "plot"
+  title: "Speedup: l2sw-2n-dnv-x553-64b-base-pdr-tsa"
+  algorithm: "plot_throughput_speedup_analysis"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/l2sw-2n-dnv-x553-64b-base-pdr-tsa"
+  data: "intel-dnv-vpp"
+  filter: "'NIC_Intel-X553' and
+           '64B' and
+           ('BASE' or 'SCALE') and
+           'NDRPDR' and
+           'ETH' and
+           ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and
+           not 'VHOST' and
+           not 'MEMIF'"
+  parameters:
+  - "throughput"
+  - "parent"
+  - "tags"
+  sort:
+  - "L2XCBASE"
+  - "L2BDMACLRN"
+  - "L2PATCH"
+  layout:
+    title: "l2sw-2n-dnv-x553-64b-base-pdr"
+    layout: "plot-throughput-speedup-analysis"
+
 ################################################################################
 
 # Packet Speedup - VPP vhost ip4 3n-hsw-x520
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
            'IP4FWD' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'DOT1Q'"
   parameters:
   - "throughput"
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            'L2BDMACLRN' and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            ('L2BDMACLRN' or 'L2XCFWD') and
            'VHOST_1024' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD' and
            not '2VM'"
   parameters:
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
            'VHOST_1024' and
            not 'CFS_OPT' and
            not 'VXLAN' and
+           not 'NF_DENSITY' and
            not 'IP4FWD'"
   parameters:
   - "throughput"
   - "tags"
   layout:
     title: "vts-3n-hsw-x520-114b-base_and_scale-pdr-tsa"
-    layout: "plot-throughput-speedup-analysis"
\ No newline at end of file
+    layout: "plot-throughput-speedup-analysis"