X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=846fa712d327ccc551922ce2809755aa32eba0ec;hp=7bb7312b11e3408decb1f626d557c1985329d4be;hb=fbe1d6dfbcacd8f3b80449b0d910b60f850b5dcc;hpb=8853921639f749a0e49e37759df2b973947977e3

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 7bb7312b11..846fa712d3 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -68,63 +68,130 @@
 
   ignore-list: "ignored_tcs.yaml"
 
+  alerting:
+
+    alerts:
+
+# As Jenkins slave is not configured to send emails, this is now only as
+# a working example:
+#
+#      # Send the list of failed tests vie email.
+#      # Pre-requisites:
+#      # - SMTP server is installed on the Jenkins slave
+#      # - SMTP server is configured to send emails. Default configuration is
+#      #   sufficient.
+#      email-failed-tests:
+#        # Title is used in logs and also as the email subject.
+#        title: "Trending: Failed Tests"
+#        # Type of alert.
+#        type: "failed-tests"
+#        # How to send the alert. The used way must be specified in the
+#        # configuration part.
+#        way: "email"
+#        # Data to be included in the alert.
+#        # Here is used the list of tables generated by the function
+#        # "table_failed_tests_html".
+#        include:
+#        - "failed-tests-3n-hsw"
+#        - "failed-tests-3n-skx"
+#        - "failed-tests-2n-skx"
+#        # This url is used in the tables instead of the original one. The aim
+#        # is to make the links usable also from the email.
+#        url: "https://docs.fd.io/csit/master/trending/trending"
+
+      # Jenkins job sends the email with failed tests.
+      # Pre-requisites:
+      # - Jenkins job is configured to send emails in "Post-build Actions" -->
+      #   "Editable Email Notification".
+      jenkins-send-failed-tests:
+        title: "Trending: Failed Tests"
+        type: "failed-tests"
+        way: "jenkins"
+        include:
+        - "failed-tests-3n-hsw"
+        - "failed-tests-3n-skx"
+        - "failed-tests-2n-skx"
+        url: "https://docs.fd.io/csit/master/trending/trending"
+
+    configurations:
+      # Configuration of the email notifications.
+      email:
+        # SMTP server
+        server: "localhost"
+        # List of recipients.
+        address-to:
+        - "csit-report@lists.fd.io"
+        # Sender
+        address-from: "testuser@testserver.com"
+
+      # Configuration of notifications sent by Jenkins.
+      jenkins:
+        # The directory in the workspace where the generated data is stored and
+        # then read by Jenkins job.
+        output-dir: "_build/_static/vpp"
+        # The name of the output files. ASCII text and HTML formats are
+        # generated.
+        output-file: "trending-failed-tests"
+        # If defined, all output files are zipped into this file.
+        zip-output: "failed-tests.tar.gz"
+
   data-sets:
 
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 100
+        start: 290
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master:
-        start: 3
+        start: 38
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 100
+        start: 290
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
-        start: 3
+        start: 38
         end: "lastCompletedBuild"
 
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 1
+        start: 50
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 1
+        start: 3
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 1
+        start: 50
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 1
+        start: 3
         end: "lastCompletedBuild"
 
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 1
+        start: 50
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 1
+        start: 3
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 1
+        start: 50
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 1
+        start: 3
         end: "lastCompletedBuild"
 
   plot-layouts:
@@ -207,31 +274,34 @@
     file-format: ".gz"
     download-path: "{job}/{build}/archives/{filename}"
     extract: "output.xml"
+    # Number of days from now to the past. Only files generated in this
+    # time period are used.
+    time-period: 90
 
   builds:
 
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
-      start: 100
+      start: 290
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master:
-      start: 3
+      start: 38
       end: "lastCompletedBuild"
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 1
+      start: 50
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 1
+      start: 3
       end: "lastCompletedBuild"
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 1
+      start: 50
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 1
+      start: 3
       end: "lastCompletedBuild"
 
 -
@@ -351,7 +421,7 @@
     # This test is "ndrdisc" test and was improperly tagged. It was fixed
     # but it remains in the old output.xml files.
   - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  window: 14
+  window: 7  # days
 
 -
   type: "table"
@@ -466,7 +536,7 @@
     # This test is "ndrdisc" test and was improperly tagged. It was fixed
     # but it remains in the old output.xml files.
   - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  window: 14
+  window: 7  # days
 
 -
   type: "table"
@@ -581,7 +651,7 @@
     # This test is "ndrdisc" test and was improperly tagged. It was fixed
     # but it remains in the old output.xml files.
   - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
-  window: 14
+  window: 7  # days
 
 -
   type: "table"
@@ -614,7 +684,7 @@
     - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -622,7 +692,7 @@
     - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -630,7 +700,7 @@
     - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -638,7 +708,7 @@
     - title: "VPP 1T1C L2 64B IACL MRR Trending 3n-hsw"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -646,7 +716,7 @@
     - title: "VPP 2T2C L2 64B IACL MRR Trending 3n-hsw"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -654,7 +724,7 @@
     - title: "VPP 4T4C L2 64B IACL MRR Trending 3n-hsw"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -662,7 +732,7 @@
     - title: "VPP 1T1C L2 64B OACL MRR Trending 3n-hsw"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -670,7 +740,7 @@
     - title: "VPP 2T2C L2 64B OACL MRR Trending 3n-hsw"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -678,7 +748,7 @@
     - title: "VPP 4T4C L2 64B OACL MRR Trending 3n-hsw"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -686,7 +756,7 @@
     - title: "VPP 1T1C L2 64B MACIP MRR Trending 3n-hsw"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -694,7 +764,7 @@
     - title: "VPP 2T2C L2 64B MACIP MRR Trending 3n-hsw"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -702,7 +772,7 @@
     - title: "VPP 4T4C L2 64B MACIP MRR Trending 3n-hsw"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -712,7 +782,7 @@
     - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -720,7 +790,7 @@
     - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -728,7 +798,7 @@
     - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -738,7 +808,7 @@
     - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -746,7 +816,7 @@
     - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -754,7 +824,7 @@
     - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
       output-file-name: "l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -788,7 +858,7 @@
     - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -796,7 +866,7 @@
     - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -804,7 +874,7 @@
     - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -812,7 +882,7 @@
     - title: "VPP 1T1C IPv4 64B IACL MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -820,7 +890,7 @@
     - title: "VPP 2T2C IPv4 64B IACL MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -828,7 +898,7 @@
     - title: "VPP 4T4C IPv4 64B IACL MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -836,7 +906,7 @@
     - title: "VPP 1T1C IPv4 64B OACL MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -844,7 +914,7 @@
     - title: "VPP 2T2C IPv4 64B OACL MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -852,7 +922,7 @@
     - title: "VPP 4T4C IPv4 64B OACL MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -860,7 +930,7 @@
     - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -868,7 +938,7 @@
     - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -876,7 +946,7 @@
     - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -912,7 +982,7 @@
     - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -920,7 +990,7 @@
     - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -928,7 +998,7 @@
     - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -962,7 +1032,7 @@
     - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-tunnels-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -970,7 +1040,7 @@
     - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-tunnels-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -978,7 +1048,7 @@
     - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-tunnels-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1014,7 +1084,7 @@
     - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
       output-file-name: "ip6-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1022,7 +1092,7 @@
     - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
       output-file-name: "ip6-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1030,7 +1100,7 @@
     - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
       output-file-name: "ip6-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1066,7 +1136,7 @@
     - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
       output-file-name: "ip6-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1074,7 +1144,7 @@
     - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
       output-file-name: "ip6-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1082,7 +1152,7 @@
     - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
       output-file-name: "ip6-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1118,7 +1188,7 @@
     - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
       output-file-name: "container-memif-imix-l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1126,7 +1196,7 @@
     - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
       output-file-name: "container-memif-imix-l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1134,7 +1204,7 @@
     - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
       output-file-name: "container-memif-imix-l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1222,7 +1292,7 @@
     - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
       output-file-name: "container-memif-imix-l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1230,7 +1300,7 @@
     - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
       output-file-name: "container-memif-imix-l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1238,7 +1308,7 @@
     - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
       output-file-name: "container-memif-imix-l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1248,7 +1318,7 @@
     - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-ethip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1256,7 +1326,7 @@
     - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-ethip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1264,7 +1334,7 @@
     - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-ethip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1274,7 +1344,7 @@
     - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1282,7 +1352,7 @@
     - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1290,7 +1360,7 @@
     - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1300,7 +1370,7 @@
     - title: "VPP 1T1C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
 
       parameters:
       - "result"
@@ -1309,7 +1379,7 @@
     - title: "VPP 2T2C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1317,7 +1387,7 @@
     - title: "VPP 4T4C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1325,7 +1395,7 @@
     - title: "VPP 1T1C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
 
       parameters:
       - "result"
@@ -1334,7 +1404,7 @@
     - title: "VPP 2T2C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1342,7 +1412,7 @@
     - title: "VPP 4T4C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1352,7 +1422,7 @@
     - title: "VPP 1T1C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
 
       parameters:
       - "result"
@@ -1361,7 +1431,7 @@
     - title: "VPP 2T2C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1369,7 +1439,7 @@
     - title: "VPP 4T4C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1377,7 +1447,7 @@
     - title: "VPP 1T1C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
 
       parameters:
       - "result"
@@ -1386,7 +1456,7 @@
     - title: "VPP 2T2C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1394,7 +1464,7 @@
     - title: "VPP 4T4C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1559,6 +1629,32 @@
       - "result"
       layout: "plot-cpta"
 
+# VTS - x520, 114B
+
+    - title: "VPP 1T1C VTS 114B MRR Trending 3n-hsw"
+      output-file-name: "vts-114b-1t1c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '1T1C' and 'VHOST' and 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VTS 114B MRR Trending 3n-hsw"
+      output-file-name: "vts-114b-2t2c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '2T2C' and 'VHOST' and 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C VTS 114B 64B MRR Trending 3n-hsw"
+      output-file-name: "vts-114b-4t4c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '4T4C' and 'VHOST' and 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
 # IPSec
 
     - title: "VPP 1T1C IPSec 64B MRR Trending 3n-hsw"
@@ -1640,7 +1736,7 @@
     - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
       output-file-name: "lb-64b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1648,7 +1744,7 @@
     - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
       output-file-name: "lb-64b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1656,7 +1752,7 @@
     - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
       output-file-name: "lb-64b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1664,7 +1760,7 @@
     - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
       output-file-name: "lb-imix-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1672,7 +1768,7 @@
     - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
       output-file-name: "lb-imix-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1680,7 +1776,7 @@
     - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
       output-file-name: "lb-imix-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1813,83 +1909,83 @@
       - "result"
       layout: "plot-cpta"
 
-# DPDK - x520 - IMIX
-
-    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# DPDK - x710 - IMIX
-
-    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-1t1c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-2t2c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-4t4c-x710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# DPDK - xl710 - IMIX
-
-    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
-      output-file-name: "dpdk-imix-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-dpdk-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## DPDK - x520 - IMIX
+#
+#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-1t1c-x520-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-2t2c-x520-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-4t4c-x520-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+## DPDK - x710 - IMIX
+#
+#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-1t1c-x710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-2t2c-x710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-4t4c-x710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+## DPDK - xl710 - IMIX
+#
+#    - title: "DPDK 1T1C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 2T2C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T4C IMIX MRR Trending 3n-hsw"
+#      output-file-name: "dpdk-imix-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-dpdk-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 ################################################################################
 # 3n-skx
@@ -1999,7 +2095,7 @@
     - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
       output-file-name: "ip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2007,7 +2103,7 @@
     - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
       output-file-name: "ip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2015,7 +2111,7 @@
     - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
       output-file-name: "ip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2151,7 +2247,7 @@
     - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
       output-file-name: "ip6-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2159,7 +2255,7 @@
     - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
       output-file-name: "ip6-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2167,7 +2263,7 @@
     - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
       output-file-name: "ip6-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2177,7 +2273,7 @@
     - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
       output-file-name: "ip6-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2185,7 +2281,7 @@
     - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
       output-file-name: "ip6-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2193,7 +2289,7 @@
     - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
       output-file-name: "ip6-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2255,7 +2351,7 @@
     - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
       output-file-name: "container-memif-imix-l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2263,7 +2359,7 @@
     - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
       output-file-name: "container-memif-imix-l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2271,7 +2367,7 @@
     - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
       output-file-name: "container-memif-imix-l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2519,7 +2615,7 @@
     - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
       output-file-name: "lb-64b-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2527,7 +2623,7 @@
     - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
       output-file-name: "lb-64b-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2535,7 +2631,7 @@
     - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
       output-file-name: "lb-64b-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2543,7 +2639,7 @@
     - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
       output-file-name: "lb-imix-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2551,7 +2647,7 @@
     - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
       output-file-name: "lb-imix-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2559,7 +2655,7 @@
     - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
       output-file-name: "lb-imix-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2569,7 +2665,7 @@
     - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
       output-file-name: "lb-64b-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2577,7 +2673,7 @@
     - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
       output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2585,7 +2681,7 @@
     - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
       output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2593,7 +2689,7 @@
     - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
       output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2601,7 +2697,7 @@
     - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
       output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2609,7 +2705,7 @@
     - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
       output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2640,31 +2736,31 @@
       - "result"
       layout: "plot-cpta"
 
-# DPDK - x710 - IMIX
-
-    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-2t1c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-4t2c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-8t4c-x710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## DPDK - x710 - IMIX
+#
+#    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-2t1c-x710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-4t2c-x710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-8t4c-x710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # DPDK - xxv710 - 64B
 
@@ -2692,31 +2788,31 @@
       - "result"
       layout: "plot-cpta"
 
-# DPDK - xxv710 - IMIX
-
-    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
-      output-file-name: "dpdk-imix-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-dpdk-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## DPDK - xxv710 - IMIX
+#
+#    - title: "DPDK 2T1C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T2C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 8T4C IMIX MRR Trending 3n-skx"
+#      output-file-name: "dpdk-imix-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-dpdk-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 ################################################################################
 # 2n-skx
@@ -2726,7 +2822,7 @@
     - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
       output-file-name: "l2-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2734,7 +2830,7 @@
     - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
       output-file-name: "l2-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2742,7 +2838,7 @@
     - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
       output-file-name: "l2-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2776,7 +2872,7 @@
     - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
       output-file-name: "l2-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2784,7 +2880,7 @@
     - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
       output-file-name: "l2-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2792,7 +2888,7 @@
     - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
       output-file-name: "l2-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2826,7 +2922,7 @@
     - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
       output-file-name: "ip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2834,7 +2930,7 @@
     - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
       output-file-name: "ip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2842,7 +2938,7 @@
     - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
       output-file-name: "ip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2876,7 +2972,7 @@
     - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
       output-file-name: "ip4-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2884,7 +2980,7 @@
     - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
       output-file-name: "ip4-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2892,7 +2988,7 @@
     - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
       output-file-name: "ip4-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2978,7 +3074,7 @@
     - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
       output-file-name: "ip6-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2986,7 +3082,7 @@
     - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
       output-file-name: "ip6-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2994,7 +3090,7 @@
     - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
       output-file-name: "ip6-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -3004,7 +3100,7 @@
     - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
       output-file-name: "ip6-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -3012,7 +3108,7 @@
     - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
       output-file-name: "ip6-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -3020,7 +3116,7 @@
     - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
       output-file-name: "ip6-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -3030,7 +3126,7 @@
     - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
       output-file-name: "container-memif-l2-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -3038,7 +3134,7 @@
     - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
       output-file-name: "container-memif-l2-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -3046,7 +3142,7 @@
     - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
       output-file-name: "container-memif-l2-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -3415,31 +3511,31 @@
       - "result"
       layout: "plot-cpta"
 
-# DPDK - x710 - IMIX
-
-    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-2t1c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-4t2c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-8t4c-x710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## DPDK - x710 - IMIX
+#
+#    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-2t1c-x710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-4t2c-x710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-8t4c-x710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # DPDK - xxv710 - 64B
 
@@ -3467,28 +3563,28 @@
       - "result"
       layout: "plot-cpta"
 
-# DPDK - xxv710 - IMIX
-
-    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
-      output-file-name: "dpdk-imix-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-dpdk-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## DPDK - xxv710 - IMIX
+#
+#    - title: "DPDK 2T1C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 4T2C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "DPDK 8T4C IMIX MRR Trending 2n-skx"
+#      output-file-name: "dpdk-imix-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-dpdk-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'DPDK'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"