CSIT-1262: Add 2n/3n-skx to trending

CSIT-1263: Edit Trending static content

Change-Id: Ief60f3bea75fb9fd153f7abb0a5933f1a3e317aa
Signed-off-by: Tibor Frank <tifrank@cisco.com>

4 files changed, 2495 insertions, 491 deletions

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 34a9459ede..d69c667594 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -43,6 +43,54 @@ THEME_OVERRIDES = """/* override table width restrictions */
 .wy-nav-content {
     max-width: 1200px !important;
 }
+.rst-content blockquote {
+    margin-left: 0px;
+    line-height: 18px;
+    margin-bottom: 0px;
+}
+.wy-menu-vertical a {
+    display: inline-block;
+    line-height: 18px;
+    padding: 0 2em;
+    display: block;
+    position: relative;
+    font-size: 90%;
+    color: #d9d9d9
+}
+.wy-menu-vertical li.current a {
+    color: gray;
+    border-right: solid 1px #c9c9c9;
+    padding: 0 3em;
+}
+.wy-menu-vertical li.toctree-l2.current > a {
+    background: #c9c9c9;
+    padding: 0 3em;
+}
+.wy-menu-vertical li.toctree-l2.current li.toctree-l3 > a {
+    display: block;
+    background: #c9c9c9;
+    padding: 0 4em;
+}
+.wy-menu-vertical li.toctree-l3.current li.toctree-l4 > a {
+    display: block;
+    background: #bdbdbd;
+    padding: 0 5em;
+}
+.wy-menu-vertical li.on a, .wy-menu-vertical li.current > a {
+    color: #404040;
+    padding: 0 2em;
+    font-weight: bold;
+    position: relative;
+    background: #fcfcfc;
+    border: none;
+        border-top-width: medium;
+        border-bottom-width: medium;
+        border-top-style: none;
+        border-bottom-style: none;
+        border-top-color: currentcolor;
+        border-bottom-color: currentcolor;
+    padding-left: 2em -4px;
+}
 """
 
 COLORS = ["SkyBlue", "Olive", "Purple", "Coral", "Indigo", "Pink",
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 9e80d1b345..99069ea630 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -17,17 +17,20 @@
 
 import logging
 import csv
+import re
 
 from string import replace
 from collections import OrderedDict
 from numpy import nan, isnan
 from xml.etree import ElementTree as ET
 
-from errors import PresentationError
 from utils import mean, stdev, relative_change, classify_anomalies, \
     convert_csv_to_pretty_txt
 
 
+REGEX_NIC = re.compile(r'\d*ge\dp\d\D*\d*')
+
+
 def generate_tables(spec, data):
     """Generate all tables specified in the specification file.
 
@@ -437,10 +440,13 @@ def table_performance_trending_dashboard(table, input_data):
                 if tst_name.lower() in table["ignore-list"]:
                     continue
                 if tbl_dict.get(tst_name, None) is None:
-                    name = "{0}-{1}".format(tst_data["parent"].split("-")[0],
-                                            tst_data["name"])
-                    tbl_dict[tst_name] = {"name": name,
-                                          "data": OrderedDict()}
+                    groups = re.search(REGEX_NIC, tst_data["parent"])
+                    if not groups:
+                        continue
+                    nic = groups.group(0)
+                    tbl_dict[tst_name] = {
+                        "name": "{0}-{1}".format(nic, tst_data["name"]),
+                        "data": OrderedDict()}
                 try:
                     tbl_dict[tst_name]["data"][str(build)] = \
                         tst_data["result"]["receive-rate"]
@@ -514,12 +520,14 @@ def table_performance_trending_dashboard(table, input_data):
     convert_csv_to_pretty_txt(file_name, txt_file_name)
 
 
-def _generate_url(base, test_name):
+def _generate_url(base, testbed, test_name):
     """Generate URL to a trending plot from the name of the test case.
 
     :param base: The base part of URL common to all test cases.
+    :param testbed: The testbed used for testing.
     :param test_name: The name of the test case.
     :type base: str
+    :type testbed: str
     :type test_name: str
     :returns: The URL to the plot with the trending data for the given test
         case.
@@ -528,65 +536,86 @@ def _generate_url(base, test_name):
 
     url = base
     file_name = ""
-    anchor = "#"
+    anchor = ".html#"
     feature = ""
 
     if "lbdpdk" in test_name or "lbvpp" in test_name:
-        file_name = "link_bonding.html"
+        file_name = "link_bonding"
 
     elif "testpmd" in test_name or "l3fwd" in test_name:
-        file_name = "dpdk.html"
+        file_name = "dpdk"
 
     elif "memif" in test_name:
-        file_name = "container_memif.html"
+        file_name = "container_memif"
+        feature = "-base"
 
     elif "srv6" in test_name:
-        file_name = "srv6.html"
+        file_name = "srv6"
 
     elif "vhost" in test_name:
         if "l2xcbase" in test_name or "l2bdbasemaclrn" in test_name:
-            file_name = "vm_vhost_l2.html"
+            file_name = "vm_vhost_l2"
         elif "ip4base" in test_name:
-            file_name = "vm_vhost_ip4.html"
+            file_name = "vm_vhost_ip4"
+        feature = "-base"
 
     elif "ipsec" in test_name:
-        file_name = "ipsec.html"
+        file_name = "ipsec"
+        feature = "-base-scale"
 
     elif "ethip4lispip" in test_name or "ethip4vxlan" in test_name:
-        file_name = "ip4_tunnels.html"
+        file_name = "ip4_tunnels"
+        feature = "-base"
 
     elif "ip4base" in test_name or "ip4scale" in test_name:
-        file_name = "ip4.html"
-        if "iacl" in test_name or "snat" in test_name or "cop" in test_name:
+        file_name = "ip4"
+        if "xl710" in test_name:
+            feature = "-base-scale-features"
+        elif "acl" in test_name or "snat" in test_name or "cop" in test_name:
             feature = "-features"
+        else:
+            feature = "-base-scale"
 
     elif "ip6base" in test_name or "ip6scale" in test_name:
-        file_name = "ip6.html"
+        file_name = "ip6"
+        feature = "-base-scale"
 
     elif "l2xcbase" in test_name or "l2xcscale" in test_name \
             or "l2bdbasemaclrn" in test_name or "l2bdscale" in test_name \
             or "l2dbbasemaclrn" in test_name or "l2dbscale" in test_name:
-        file_name = "l2.html"
-        if "iacl" in test_name:
+        file_name = "l2"
+        if "acl" in test_name:
             feature = "-features"
+        else:
+            feature = "-base-scale"
 
     if "x520" in test_name:
-        anchor += "x520-"
+        nic = "x520-"
     elif "x710" in test_name:
-        anchor += "x710-"
+        nic = "x710-"
     elif "xl710" in test_name:
-        anchor += "xl710-"
+        nic = "xl710-"
+    elif "xxv710" in test_name:
+        nic = "xxv710-"
+    else:
+        nic = ""
+    anchor += nic
 
     if "64b" in test_name:
-        anchor += "64b-"
+        framesize = "64b"
     elif "78b" in test_name:
-        anchor += "78b-"
+        framesize = "78b"
     elif "imix" in test_name:
-        anchor += "imix-"
+        framesize = "imix"
     elif "9000b" in test_name:
-        anchor += "9000b-"
-    elif "1518" in test_name:
-        anchor += "1518b-"
+        framesize = "9000b"
+    elif "1518b" in test_name:
+        framesize = "1518b"
+    elif "114b" in test_name:
+        framesize = "114b"
+    else:
+        framesize = ""
+    anchor += framesize + '-'
 
     if "1t1c" in test_name:
         anchor += "1t1c"
@@ -594,8 +623,15 @@ def _generate_url(base, test_name):
         anchor += "2t2c"
     elif "4t4c" in test_name:
         anchor += "4t4c"
+    elif "2t1c" in test_name:
+        anchor += "2t1c"
+    elif "4t2c" in test_name:
+        anchor += "4t2c"
+    elif "8t4c" in test_name:
+        anchor += "8t4c"
 
-    return url + file_name + anchor + feature
+    return url + file_name + '-' + testbed + '-' + nic + framesize + feature + \
+           anchor + feature
 
 
 def table_performance_trending_dashboard_html(table, input_data):
@@ -605,10 +641,16 @@ def table_performance_trending_dashboard_html(table, input_data):
 
     :param table: Table to generate.
     :param input_data: Data to process.
-    :type table: pandas.Series
+    :type table: dict
     :type input_data: InputData
     """
 
+    testbed = table.get("testbed", None)
+    if testbed is None:
+        logging.error("The testbed is not defined for the table '{0}'.".
+                      format(table.get("title", "")))
+        return
+
     logging.info("  Generating the table {0} ...".
                  format(table.get("title", "")))
 
@@ -654,7 +696,7 @@ def table_performance_trending_dashboard_html(table, input_data):
             td = ET.SubElement(tr, "td", attrib=dict(align=alignment))
             # Name:
             if c_idx == 0:
-                url = _generate_url("../trending/", item)
+                url = _generate_url("../trending/", testbed, item)
                 ref = ET.SubElement(td, "a", attrib=dict(href=url))
                 ref.text = item
             else:
@@ -705,10 +747,13 @@ def table_failed_tests(table, input_data):
                 if tst_name.lower() in table["ignore-list"]:
                     continue
                 if tbl_dict.get(tst_name, None) is None:
-                    name = "{0}-{1}".format(tst_data["parent"].split("-")[0],
-                                            tst_data["name"])
-                    tbl_dict[tst_name] = {"name": name,
-                                          "data": OrderedDict()}
+                    groups = re.search(REGEX_NIC, tst_data["parent"])
+                    if not groups:
+                        continue
+                    nic = groups.group(0)
+                    tbl_dict[tst_name] = {
+                        "name": "{0}-{1}".format(nic, tst_data["name"]),
+                        "data": OrderedDict()}
                 try:
                     tbl_dict[tst_name]["data"][build] = (
                         tst_data["status"],
@@ -763,6 +808,12 @@ def table_failed_tests_html(table, input_data):
     :type input_data: InputData
     """
 
+    testbed = table.get("testbed", None)
+    if testbed is None:
+        logging.error("The testbed is not defined for the table '{0}'.".
+                      format(table.get("title", "")))
+        return
+
     logging.info("  Generating the table {0} ...".
                  format(table.get("title", "")))
 
@@ -800,7 +851,7 @@ def table_failed_tests_html(table, input_data):
             td = ET.SubElement(tr, "td", attrib=dict(align=alignment))
             # Name:
             if c_idx == 0:
-                url = _generate_url("../trending/", item)
+                url = _generate_url("../trending/", testbed, item)
                 ref = ET.SubElement(td, "a", attrib=dict(href=url))
                 ref.text = item
             else:
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 0ecaf3fa5c..340b7dc372 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -698,6 +698,7 @@ class ExecutionChecker(ResultVisitor):
                     self._data["tests"][self._test_ID] = test_result
                     logging.error("The test '{0}' has no or more than one "
                                   "multi-threading tags.".format(self._test_ID))
+                    logging.error("Tags: {0}".format(test_result["tags"]))
                     return
 
         if test.status == "PASS" and ("NDRPDRDISC" in tags or
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 4d996a0a5a..aa8528ceb4 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -69,22 +69,64 @@
   ignore-list: "ignored_tcs.yaml"
 
   data-sets:
-    plot-performance-trending-all:
+
+    # 3n-hsw
+    plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
         start: 100
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master:
         start: 3
         end: "lastCompletedBuild"
-    plot-performance-trending-vpp:
+
+    plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
         start: 100
         end: "lastCompletedBuild"
-    plot-performance-trending-dpdk:
+
+    plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
         start: 3
         end: "lastCompletedBuild"
 
+    # 3n-skx
+    plot-performance-trending-all-3n-skx:
+      csit-vpp-perf-mrr-daily-master-3n-skx:
+        start: 1
+        end: "lastCompletedBuild"
+      csit-dpdk-perf-mrr-weekly-master-3n-skx:
+        start: 1
+        end: "lastCompletedBuild"
+
+    plot-performance-trending-vpp-3n-skx:
+      csit-vpp-perf-mrr-daily-master-3n-skx:
+        start: 1
+        end: "lastCompletedBuild"
+
+    plot-performance-trending-dpdk-3n-skx:
+      csit-dpdk-perf-mrr-weekly-master-3n-skx:
+        start: 1
+        end: "lastCompletedBuild"
+
+    # 2n-skx
+    plot-performance-trending-all-2n-skx:
+      csit-vpp-perf-mrr-daily-master-2n-skx:
+        start: 1
+        end: "lastCompletedBuild"
+      csit-dpdk-perf-mrr-weekly-master-2n-skx:
+        start: 1
+        end: "lastCompletedBuild"
+
+    plot-performance-trending-vpp-2n-skx:
+      csit-vpp-perf-mrr-daily-master-2n-skx:
+        start: 1
+        end: "lastCompletedBuild"
+
+    plot-performance-trending-dpdk-2n-skx:
+      csit-dpdk-perf-mrr-weekly-master-2n-skx:
+        start: 1
+        end: "lastCompletedBuild"
+
   plot-layouts:
 
     plot-cpta:
@@ -165,7 +207,10 @@
     file-format: ".gz"
     download-path: "{job}/{build}/archives/{filename}"
     extract: "output.xml"
+
   builds:
+
+    # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
       start: 100
       end: "lastCompletedBuild"
@@ -173,6 +218,22 @@
       start: 3
       end: "lastCompletedBuild"
 
+    # 3n-skx
+    csit-vpp-perf-mrr-daily-master-3n-skx:
+      start: 1
+      end: "lastCompletedBuild"
+    csit-dpdk-perf-mrr-weekly-master-3n-skx:
+      start: 1
+      end: "lastCompletedBuild"
+
+    # 2n-skx
+    csit-vpp-perf-mrr-daily-master-2n-skx:
+      start: 1
+      end: "lastCompletedBuild"
+    csit-dpdk-perf-mrr-weekly-master-2n-skx:
+      start: 1
+      end: "lastCompletedBuild"
+
 -
   type: "output"
   output:
@@ -185,13 +246,15 @@
 ###                               T A B L E S                                ###
 ################################################################################
 
+################################################################################
+# 3n-hsw
 -
   type: "table"
-  title: "Performance trending dashboard"
+  title: "Performance trending dashboard 1t1c-3n-hsw"
   algorithm: "table_performance_trending_dashboard"
   output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c"
-  data: "plot-performance-trending-all"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw"
+  data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '1T1C' and not 'NIC_Intel-XXV710'"
   parameters:
   - "name"
@@ -208,11 +271,11 @@
 
 -
   type: "table"
-  title: "Performance trending dashboard"
+  title: "Performance trending dashboard 2t2c-3n-hsw"
   algorithm: "table_performance_trending_dashboard"
   output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c"
-  data: "plot-performance-trending-all"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw"
+  data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '2T2C' and not 'NIC_Intel-XXV710'"
   parameters:
   - "name"
@@ -229,11 +292,11 @@
 
 -
   type: "table"
-  title: "Performance trending dashboard"
+  title: "Performance trending dashboard 4t4c-3n-hsw"
   algorithm: "table_performance_trending_dashboard"
   output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c"
-  data: "plot-performance-trending-all"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw"
+  data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '4T4C' and not 'NIC_Intel-XXV710'"
   parameters:
   - "name"
@@ -250,32 +313,35 @@
 
 -
   type: "table"
-  title: "HTML performance trending dashboard 1t1c"
+  title: "HTML performance trending dashboard 1t1c-3n-hsw"
   algorithm: "table_performance_trending_dashboard_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c.rst"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw.rst"
+  testbed: "3n-hsw"
 
 -
   type: "table"
-  title: "HTML performance trending dashboard 2t2c"
+  title: "HTML performance trending dashboard 2t2c-3n-hsw"
   algorithm: "table_performance_trending_dashboard_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c.rst"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c-3n-hsw.rst"
+  testbed: "3n-hsw"
 
 -
   type: "table"
-  title: "HTML performance trending dashboard 4t4c"
+  title: "HTML performance trending dashboard 4t4c-3n-hsw"
   algorithm: "table_performance_trending_dashboard_html"
-  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c.csv"
-  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c.rst"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw.rst"
+  testbed: "3n-hsw"
 
 -
   type: "table"
-  title: "Failed MRR tests"
+  title: "Failed MRR tests 3n-hsw"
   algorithm: "table_failed_tests"
   output-file-ext: ".csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests"
-  data: "plot-performance-trending-all"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw"
+  data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and not 'NIC_Intel-XXV710'"
   parameters:
   - "name"
@@ -289,10 +355,241 @@
 
 -
   type: "table"
-  title: "HTML Failed MRR tests"
+  title: "HTML Failed MRR tests 3n-hsw"
   algorithm: "table_failed_tests_html"
-  input-file: "{DIR[STATIC,VPP]}/failed-tests.csv"
-  output-file: "{DIR[STATIC,VPP]}/failed-tests.rst"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.rst"
+  testbed: "3n-hsw"
+
+################################################################################
+# 3n-skx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-3n-skx"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx"
+  data: "plot-performance-trending-all-3n-skx"
+  filter: "'MRR' and '2T1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+    # 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"
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard 4t2c-3n-skx"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-skx"
+  data: "plot-performance-trending-all-3n-skx"
+  filter: "'MRR' and '4T2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+    # 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.tc05-64b-4t2c-eth-l2bdscale1mmaclrn-ndrdisc"
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard 8t4c-3n-skx"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-3n-skx"
+  data: "plot-performance-trending-all-3n-skx"
+  filter: "'MRR' and '8T4C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+    # 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.tc09-64b-8t4c-eth-l2bdscale1mmaclrn-ndrdisc"
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-3n-skx"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx.rst"
+  testbed: "3n-skx"
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 4t2c-3n-skx"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-skx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-3n-skx.rst"
+  testbed: "3n-skx"
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 8t4c-3n-skx"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-3n-skx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-3n-skx.rst"
+  testbed: "3n-skx"
+
+-
+  type: "table"
+  title: "Failed MRR tests 3n-skx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx"
+  data: "plot-performance-trending-all-3n-skx"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "status"
+  ignore-list:
+    # 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
+
+-
+  type: "table"
+  title: "HTML Failed MRR tests 3n-skx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx.rst"
+  testbed: "3n-skx"
+
+################################################################################
+# 2n-skx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-skx"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx"
+  data: "plot-performance-trending-all-2n-skx"
+  filter: "'MRR' and '2T1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+    # 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"
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard 4t2c-2n-skx"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-skx"
+  data: "plot-performance-trending-all-2n-skx"
+  filter: "'MRR' and '4T2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+    # 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.tc05-64b-4t2c-eth-l2bdscale1mmaclrn-ndrdisc"
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard 8t4c-2n-skx"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-skx"
+  data: "plot-performance-trending-all-2n-skx"
+  filter: "'MRR' and '8T4C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  ignore-list:
+    # 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.tc09-64b-8t4c-eth-l2bdscale1mmaclrn-ndrdisc"
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-skx"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx.rst"
+  testbed: "2n-skx"
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 4t2c-2n-skx"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-skx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t2c-2n-skx.rst"
+  testbed: "2n-skx"
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 8t4c-2n-skx"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-skx.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-8t4c-2n-skx.rst"
+  testbed: "2n-skx"
+
+-
+  type: "table"
+  title: "Failed MRR tests 2n-skx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx"
+  data: "plot-performance-trending-all-2n-skx"
+  filter: "'MRR'"
+  parameters:
+  - "name"
+  - "parent"
+  - "status"
+  ignore-list:
+    # 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
+
+-
+  type: "table"
+  title: "HTML Failed MRR tests 2n-skx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx.rst"
+  testbed: "2n-skx"
 
 
 ################################################################################
@@ -300,58 +597,63 @@
 ################################################################################
 
 # Plots VPP Continuous Performance Trending and Analysis
+
 -
   type: "cpta"
   title: "Continuous Performance Trending and Analysis"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/cpta"
+
   plots:
 
+################################################################################
+# 3n-hsw
+
 # L2 - x520
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-feature-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+      output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-feature-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+      output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-feature-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+      output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
@@ -359,25 +661,25 @@
 
 # L2 - xl710
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-1t1c-xl710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-2t2c-xl710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-4t4c-xl710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
@@ -385,49 +687,49 @@
 
 # L2 - x710
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-feature-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-feature-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
-      output-file-name: "l2-feature-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
@@ -435,49 +737,49 @@
 
 # IPv4 - x520
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-feature-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-feature-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-feature-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
@@ -485,25 +787,25 @@
 
 # IPv4 - xl710
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-1t1c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-2t2c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-4t4c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
@@ -511,49 +813,49 @@
 
 # IPv4 - x710
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-feature-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-feature-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
-      output-file-name: "ip4-feature-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
@@ -561,25 +863,25 @@
 
 # IPv4 Tunnels - x520
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - Trending"
-      output-file-name: "ip4-tunnels-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending"
-      output-file-name: "ip4-tunnels-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending"
-      output-file-name: "ip4-tunnels-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
@@ -587,25 +889,25 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - Trending"
-      output-file-name: "ip4-tunnels-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-tunnels-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending"
-      output-file-name: "ip4-tunnels-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-tunnels-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending"
-      output-file-name: "ip4-tunnels-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+      output-file-name: "ip4-tunnels-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
       parameters:
       - "result"
@@ -613,25 +915,25 @@
 
 # IPv6 - x520
 
-    - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
@@ -639,25 +941,25 @@
 
 # IPv6 - xl710
 
-    - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-1t1c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+      output-file-name: "ip6-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-2t2c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+      output-file-name: "ip6-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-4t4c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+      output-file-name: "ip6-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
@@ -665,25 +967,25 @@
 
 # IPv6 - x710
 
-    - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
-      output-file-name: "ip6-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
@@ -691,25 +993,25 @@
 
 # Container memif - x520, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-1t1c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-2t2c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-4t4c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
@@ -717,25 +1019,25 @@
 
 # Container memif - x520, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
@@ -743,25 +1045,25 @@
 
 # Container memif - xl710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-1t1c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-2t2c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-4t4c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
@@ -769,25 +1071,25 @@
 
 # Container memif - xl710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-1t1c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+      output-file-name: "container-memif-imix-l2-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-2t2c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+      output-file-name: "container-memif-imix-l2-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-4t4c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+      output-file-name: "container-memif-imix-l2-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
@@ -795,51 +1097,51 @@
 
 # Container memif - x710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
-      output-file-name: "container-memif-l2-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+      output-file-name: "container-memif-l2-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-# Container memif - x520, IMIX
+# Container memif - x710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
-      output-file-name: "container-memif-imix-l2-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
@@ -847,291 +1149,291 @@
 
 # VM vhost - x520, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-ethip4-1t1c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-ethip4-2t2c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-ethip4-4t4c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-ethip4-1t1c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-ethip4-2t2c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-ethip4-4t4c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-1t1c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-2t2c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-4t4c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x520"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-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 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xl710, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-1t1c-xl710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-2t2c-xl710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-4t4c-xl710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xl710, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-1t1c-xl710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-2t2c-xl710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-4t4c-xl710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-ethip4-1t1c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-ethip4-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-ethip4-2t2c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-ethip4-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-ethip4-4t4c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-ethip4-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-ethip4-1t1c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-ethip4-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-ethip4-2t2c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-ethip4-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-ethip4-4t4c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND'"
+    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-ethip4-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-1t1c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-2t2c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
-      output-file-name: "vm-vhost-eth-4t4c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x710"
-      data: "plot-performance-trending-vpp"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND'"
+    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPSec
 
-    - title: "VPP 1T1C IPSec 64B Packet Throughput - Trending"
-      output-file-name: "ipsec-1t1c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C IPSec 64B MRR Trending 3n-hsw"
+      output-file-name: "ipsec-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPSec 64B Packet Throughput - Trending"
-      output-file-name: "ipsec-2t2c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C IPSec 64B MRR Trending 3n-hsw"
+      output-file-name: "ipsec-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPSec 64B Packet Throughput - Trending"
-      output-file-name: "ipsec-4t4c-xl710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C IPSec 64B MRR Trending 3n-hsw"
+      output-file-name: "ipsec-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
       parameters:
       - "result"
@@ -1139,49 +1441,49 @@
 
 # SRv6 - x520
 
-    - title: "VPP 1T1C SRv6 78B MRR Trending"
-      output-file-name: "srv6-78b-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C SRv6 78B MRR Trending 3n-hsw"
+      output-file-name: "srv6-78b-1t1c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C SRv6 78B MRR Trending"
-      output-file-name: "srv6-78b-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C SRv6 78B MRR Trending 3n-hsw"
+      output-file-name: "srv6-78b-2t2c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C SRv6 78B MRR Trending"
-      output-file-name: "srv6-78b-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C SRv6 78B MRR Trending 3n-hsw"
+      output-file-name: "srv6-78b-4t4c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C SRv6 IMIX MRR Trending"
-      output-file-name: "srv6-imix-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C SRv6 IMIX MRR Trending 3n-hsw"
+      output-file-name: "srv6-imix-1t1c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C SRv6 IMIX MRR Trending"
-      output-file-name: "srv6-imix-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C SRv6 IMIX MRR Trending 3n-hsw"
+      output-file-name: "srv6-imix-2t2c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C SRv6 IMIX MRR Trending"
-      output-file-name: "srv6-imix-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C SRv6 IMIX MRR Trending 3n-hsw"
+      output-file-name: "srv6-imix-4t4c-x520-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
       parameters:
       - "result"
@@ -1189,49 +1491,49 @@
 
 # Link Bonding - x520
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending"
-      output-file-name: "lb-64b-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending"
-      output-file-name: "lb-64b-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending"
-      output-file-name: "lb-64b-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending"
-      output-file-name: "lb-imix-1t1c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending"
-      output-file-name: "lb-imix-2t2c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending"
-      output-file-name: "lb-imix-4t4c-x520"
-      data: "plot-performance-trending-vpp"
+    - 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'"
       parameters:
       - "result"
@@ -1239,49 +1541,49 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending"
-      output-file-name: "lb-64b-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
+      output-file-name: "lb-64b-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending"
-      output-file-name: "lb-64b-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+      output-file-name: "lb-64b-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending"
-      output-file-name: "lb-64b-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+      output-file-name: "lb-64b-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending"
-      output-file-name: "lb-imix-1t1c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+      output-file-name: "lb-imix-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending"
-      output-file-name: "lb-imix-2t2c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+      output-file-name: "lb-imix-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending"
-      output-file-name: "lb-imix-4t4c-x710"
-      data: "plot-performance-trending-vpp"
+    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+      output-file-name: "lb-imix-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
@@ -1289,25 +1591,25 @@
 
 # DPDK - x520 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending"
-      output-file-name: "dpdk-64b-1t1c-x520"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-1t1c-x520-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending"
-      output-file-name: "dpdk-64b-2t2c-x520"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-2t2c-x520-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending"
-      output-file-name: "dpdk-64b-4t4c-x520"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-4t4c-x520-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
@@ -1315,25 +1617,25 @@
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending"
-      output-file-name: "dpdk-64b-1t1c-x710"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-1t1c-x710-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending"
-      output-file-name: "dpdk-64b-2t2c-x710"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-2t2c-x710-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending"
-      output-file-name: "dpdk-64b-4t4c-x710"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-4t4c-x710-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
@@ -1341,25 +1643,25 @@
 
 # DPDK - xl710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending"
-      output-file-name: "dpdk-64b-1t1c-xl710"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending"
-      output-file-name: "dpdk-64b-2t2c-xl710"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending"
-      output-file-name: "dpdk-64b-4t4c-xl710"
-      data: "plot-performance-trending-dpdk"
+    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+      output-file-name: "dpdk-64b-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
@@ -1367,25 +1669,25 @@
 
 # DPDK - x520 - IMIX
 
-    - title: "DPDK 1T1C IMIX MRR Trending"
-      output-file-name: "dpdk-imix-1t1c-x520"
-      data: "plot-performance-trending-dpdk"
+    - 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"
-      output-file-name: "dpdk-imix-2t2c-x520"
-      data: "plot-performance-trending-dpdk"
+    - 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"
-      output-file-name: "dpdk-imix-4t4c-x520"
-      data: "plot-performance-trending-dpdk"
+    - 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"
@@ -1393,25 +1695,25 @@
 
 # DPDK - x710 - IMIX
 
-    - title: "DPDK 1T1C IMIX MRR Trending"
-      output-file-name: "dpdk-imix-1t1c-x710"
-      data: "plot-performance-trending-dpdk"
+    - 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"
-      output-file-name: "dpdk-imix-2t2c-x710"
-      data: "plot-performance-trending-dpdk"
+    - 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"
-      output-file-name: "dpdk-imix-4t4c-x710"
-      data: "plot-performance-trending-dpdk"
+    - 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"
@@ -1419,26 +1721,1628 @@
 
 # DPDK - xl710 - IMIX
 
-    - title: "DPDK 1T1C IMIX MRR Trending"
-      output-file-name: "dpdk-imix-1t1c-xl710"
-      data: "plot-performance-trending-dpdk"
+    - 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"
-      output-file-name: "dpdk-imix-2t2c-xl710"
-      data: "plot-performance-trending-dpdk"
+    - 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"
-      output-file-name: "dpdk-imix-4t4c-xl710"
-      data: "plot-performance-trending-dpdk"
+    - 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
+
+# L2 - x710
+
+    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-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 ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-feature-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-feature-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-feature-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# L2 - xxv710
+
+    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-feature-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-feature-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+      output-file-name: "l2-feature-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 - x710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-feature-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-feature-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-feature-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 - xxv710
+
+    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-feature-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-feature-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-feature-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 Tunnels - x710
+
+    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-tunnels-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-tunnels-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-tunnels-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 Tunnels - xxv710
+
+    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-tunnels-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-tunnels-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+      output-file-name: "ip4-tunnels-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv6 - x710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv6 - xxv710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Container memif - x710, 64B
+
+    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+      output-file-name: "container-memif-l2-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+      output-file-name: "container-memif-l2-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+      output-file-name: "container-memif-l2-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Container memif - xxv710, 64B
+
+    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+      output-file-name: "container-memif-l2-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+      output-file-name: "container-memif-l2-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+      output-file-name: "container-memif-l2-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Container memif - x710, IMIX
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Container memif - xxv710, IMIX
+
+    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+      output-file-name: "container-memif-imix-l2-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+      output-file-name: "container-memif-imix-l2-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+      output-file-name: "container-memif-imix-l2-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - x710, ethip4, 64B
+
+    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-ethip4-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-ethip4-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-ethip4-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - xxv710, ethip4, 64B
+
+    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-ethip4-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-ethip4-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-ethip4-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - x710, ethip4, IMIX
+
+    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - xxv710, ethip4, IMIX
+
+    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - x710, eth, 64B
+
+    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-eth-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-eth-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-eth-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - xxv710, eth, 64B
+
+    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-eth-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-eth-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-eth-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - x710, eth, IMIX
+
+    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-eth-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-eth-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-eth-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - xxv710, eth, IMIX
+
+    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+      output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-vpp-3n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Link Bonding - x710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Link Bonding - xxv710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# DPDK - x710 - 64B
+
+    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+      output-file-name: "dpdk-64b-2t1c-x710-3n-skx"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+      output-file-name: "dpdk-64b-4t2c-x710-3n-skx"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+      output-file-name: "dpdk-64b-8t4c-x710-3n-skx"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      filter: "'NIC_Intel-X710' and '64B' 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
+
+    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+      output-file-name: "dpdk-64b-2t1c-xxv710-3n-skx"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+      output-file-name: "dpdk-64b-4t2c-xxv710-3n-skx"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+      output-file-name: "dpdk-64b-8t4c-xxv710-3n-skx"
+      data: "plot-performance-trending-dpdk-3n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' 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
+
+# L2 - x710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+      output-file-name: "l2-feature-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+      output-file-name: "l2-feature-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+      output-file-name: "l2-feature-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# L2 - xxv710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+      output-file-name: "l2-feature-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+      output-file-name: "l2-feature-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+      output-file-name: "l2-feature-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 - x710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-feature-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-feature-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-feature-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 - xxv710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-feature-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-feature-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-feature-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 Tunnels - x710
+
+    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-tunnels-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-tunnels-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-tunnels-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv4 Tunnels - xxv710
+
+    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-tunnels-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-tunnels-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+      output-file-name: "ip4-tunnels-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv6 - x710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPv6 - xxv710
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Container memif - x710, 64B
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - 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'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Container memif - xxv710, 64B
+
+    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
+      output-file-name: "container-memif-l2-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
+      output-file-name: "container-memif-l2-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
+      output-file-name: "container-memif-l2-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - x710, ethip4, 64B
+
+    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-ethip4-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-ethip4-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-ethip4-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - xxv710, ethip4, 64B
+
+    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-ethip4-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-ethip4-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-ethip4-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - x710, ethip4, IMIX
+
+    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - xxv710, ethip4, IMIX
+
+    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - x710, eth, 64B
+
+    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-eth-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-eth-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-eth-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - xxv710, eth, 64B
+
+    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-eth-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-eth-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-eth-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - x710, eth, IMIX
+
+    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-eth-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-eth-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-eth-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# VM vhost - xxv710, eth, IMIX
+
+    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
+      output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Link Bonding - x710
+
+    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
+      output-file-name: "lb-64b-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
+      output-file-name: "lb-64b-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
+      output-file-name: "lb-64b-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
+      output-file-name: "lb-imix-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
+      output-file-name: "lb-imix-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
+      output-file-name: "lb-imix-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# Link Bonding - xxv710
+
+    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
+      output-file-name: "lb-64b-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
+      output-file-name: "lb-64b-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
+      output-file-name: "lb-64b-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
+      output-file-name: "lb-imix-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
+      output-file-name: "lb-imix-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
+      output-file-name: "lb-imix-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-vpp-2n-skx"
+      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# DPDK - x710 - 64B
+
+    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
+      output-file-name: "dpdk-64b-2t1c-x710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
+      output-file-name: "dpdk-64b-4t2c-x710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
+      output-file-name: "dpdk-64b-8t4c-x710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-X710' and '64B' 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
+
+    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
+      output-file-name: "dpdk-64b-2t1c-xxv710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
+      output-file-name: "dpdk-64b-4t2c-xxv710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
+      output-file-name: "dpdk-64b-8t4c-xxv710-2n-skx"
+      data: "plot-performance-trending-dpdk-2n-skx"
+      filter: "'NIC_Intel-XXV710' and '64B' 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"