CSIT-1116: Add dpdk mrr tests to trending

 - Add static content
 - Add models to specification
 - Add plots
 - Add dpdk tests to dashboard
 - Add dpdk to csv and pretty ASCII tables
 - Get DPDK version from output.xml

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

4 files changed, 623 insertions, 354 deletions

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 2c62e11a97..c996aca0bd 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -87,7 +87,7 @@ def generate_cpta(spec, data):
     return ret_code
 
 
-def _generate_trending_traces(in_data, build_info, moving_win_size=10,
+def _generate_trending_traces(in_data, job_name, build_info, moving_win_size=10,
                               show_trend_line=True, name="", color=""):
     """Generate the trending traces:
      - samples,
@@ -95,12 +95,14 @@ def _generate_trending_traces(in_data, build_info, moving_win_size=10,
      - outliers, regress, progress
 
     :param in_data: Full data set.
+    :param job_name: The name of job which generated the data.
     :param build_info: Information about the builds.
     :param moving_win_size: Window size.
     :param show_trend_line: Show moving median (trending plot).
     :param name: Name of the plot
     :param color: Name of the color for the plot.
     :type in_data: OrderedDict
+    :type job_name: str
     :type build_info: dict
     :type moving_win_size: int
     :type show_trend_line: bool
@@ -116,10 +118,15 @@ def _generate_trending_traces(in_data, build_info, moving_win_size=10,
     hover_text = list()
     xaxis = list()
     for idx in data_x:
-        hover_text.append("vpp-ref: {0}<br>csit-ref: mrr-daily-build-{1}".
-                          format(build_info[str(idx)][1].rsplit('~', 1)[0],
-                                 idx))
-        date = build_info[str(idx)][0]
+        if "dpdk" in job_name:
+            hover_text.append("dpdk-ref: {0}<br>csit-ref: mrr-weekly-build-{1}".
+                              format(build_info[job_name][str(idx)][1].
+                                     rsplit('~', 1)[0], idx))
+        elif "vpp" in job_name:
+            hover_text.append("vpp-ref: {0}<br>csit-ref: mrr-daily-build-{1}".
+                              format(build_info[job_name][str(idx)][1].
+                                     rsplit('~', 1)[0], idx))
+        date = build_info[job_name][str(idx)][0]
         xaxis.append(datetime(int(date[0:4]), int(date[4:6]), int(date[6:8]),
                               int(date[9:11]), int(date[12:])))
 
@@ -229,7 +236,10 @@ def _generate_trending_traces(in_data, build_info, moving_win_size=10,
         )
         traces.append(trace_trend)
 
-    return traces, anomaly_classification[-1]
+    if anomaly_classification:
+        return traces, anomaly_classification[-1]
+    else:
+        return traces, None
 
 
 def _generate_all_charts(spec, input_data):
@@ -252,7 +262,7 @@ def _generate_all_charts(spec, input_data):
         logs.append(("INFO", "  Generating the chart '{0}' ...".
                      format(graph.get("title", ""))))
 
-        job_name = spec.cpta["data"].keys()[0]
+        job_name = graph["data"].keys()[0]
 
         csv_tbl = list()
         res = list()
@@ -266,8 +276,10 @@ def _generate_all_charts(spec, input_data):
             return
 
         chart_data = dict()
-        for job in data:
-            for index, bld in job.items():
+        for job, job_data in data.iteritems():
+            if job != job_name:
+                continue
+            for index, bld in job_data.items():
                 for test_name, test in bld.items():
                     if chart_data.get(test_name, None) is None:
                         chart_data[test_name] = OrderedDict()
@@ -280,7 +292,7 @@ def _generate_all_charts(spec, input_data):
         # Add items to the csv table:
         for tst_name, tst_data in chart_data.items():
             tst_lst = list()
-            for bld in builds_lst:
+            for bld in builds_dict[job_name]:
                 itm = tst_data.get(int(bld), '')
                 tst_lst.append(str(itm))
             csv_tbl.append("{0},".format(tst_name) + ",".join(tst_lst) + '\n')
@@ -296,6 +308,7 @@ def _generate_all_charts(spec, input_data):
             test_name = test_name.split('.')[-1]
             trace, rslt = _generate_trending_traces(
                 test_data,
+                job_name=job_name,
                 build_info=build_info,
                 moving_win_size=win_size,
                 name='-'.join(test_name.split('-')[3:-1]),
@@ -322,30 +335,32 @@ def _generate_all_charts(spec, input_data):
                 logs.append(("WARNING", "No data for the plot. Skipped."))
 
         data_out = {
+            "job_name": job_name,
             "csv_table": csv_tbl,
             "results": res,
             "logs": logs
         }
         data_q.put(data_out)
 
-    job_name = spec.cpta["data"].keys()[0]
-
-    builds_lst = list()
-    for build in spec.input["builds"][job_name]:
-        status = build["status"]
-        if status != "failed" and status != "not found":
-            builds_lst.append(str(build["build"]))
-
-    # Get "build ID": "date" dict:
-    build_info = OrderedDict()
-    for build in builds_lst:
-        try:
-            build_info[build] = (
-                input_data.metadata(job_name, build)["generated"][:14],
-                input_data.metadata(job_name, build)["version"]
+    builds_dict = dict()
+    for job in spec.input["builds"].keys():
+        if builds_dict.get(job, None) is None:
+            builds_dict[job] = list()
+        for build in spec.input["builds"][job]:
+            status = build["status"]
+            if status != "failed" and status != "not found":
+                builds_dict[job].append(str(build["build"]))
+
+    # Create "build ID": "date" dict:
+    build_info = dict()
+    for job_name, job_data in builds_dict.items():
+        if build_info.get(job_name, None) is None:
+            build_info[job_name] = OrderedDict()
+        for build in job_data:
+            build_info[job_name][build] = (
+                input_data.metadata(job_name, build).get("generated", ""),
+                input_data.metadata(job_name, build).get("version", "")
             )
-        except KeyError:
-            build_info[build] = ("", "")
 
     work_queue = multiprocessing.JoinableQueue()
     manager = multiprocessing.Manager()
@@ -370,21 +385,24 @@ def _generate_all_charts(spec, input_data):
     anomaly_classifications = list()
 
     # Create the header:
-    csv_table = list()
-    header = "Build Number:," + ",".join(builds_lst) + '\n'
-    csv_table.append(header)
-    build_dates = [x[0] for x in build_info.values()]
-    header = "Build Date:," + ",".join(build_dates) + '\n'
-    csv_table.append(header)
-    vpp_versions = [x[1] for x in build_info.values()]
-    header = "VPP Version:," + ",".join(vpp_versions) + '\n'
-    csv_table.append(header)
+    csv_tables = dict()
+    for job_name in builds_dict.keys():
+        if csv_tables.get(job_name, None) is None:
+            csv_tables[job_name] = list()
+        header = "Build Number:," + ",".join(builds_dict[job_name]) + '\n'
+        csv_tables[job_name].append(header)
+        build_dates = [x[0] for x in build_info[job_name].values()]
+        header = "Build Date:," + ",".join(build_dates) + '\n'
+        csv_tables[job_name].append(header)
+        versions = [x[1] for x in build_info[job_name].values()]
+        header = "Version:," + ",".join(versions) + '\n'
+        csv_tables[job_name].append(header)
 
     while not data_queue.empty():
         result = data_queue.get()
 
         anomaly_classifications.extend(result["results"])
-        csv_table.extend(result["csv_table"])
+        csv_tables[result["job_name"]].extend(result["csv_table"])
 
         for item in result["logs"]:
             if item[0] == "INFO":
@@ -406,33 +424,34 @@ def _generate_all_charts(spec, input_data):
         worker.join()
 
     # Write the tables:
-    file_name = spec.cpta["output-file"] + "-trending"
-    with open("{0}.csv".format(file_name), 'w') as file_handler:
-        file_handler.writelines(csv_table)
-
-    txt_table = None
-    with open("{0}.csv".format(file_name), 'rb') as csv_file:
-        csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
-        line_nr = 0
-        for row in csv_content:
-            if txt_table is None:
-                txt_table = prettytable.PrettyTable(row)
-            else:
-                if line_nr > 1:
-                    for idx, item in enumerate(row):
-                        try:
-                            row[idx] = str(round(float(item) / 1000000, 2))
-                        except ValueError:
-                            pass
-                try:
-                    txt_table.add_row(row)
-                except Exception as err:
-                    logging.warning("Error occurred while generating TXT table:"
-                                    "\n{0}".format(err))
-            line_nr += 1
-        txt_table.align["Build Number:"] = "l"
-    with open("{0}.txt".format(file_name), "w") as txt_file:
-        txt_file.write(str(txt_table))
+    for job_name, csv_table in csv_tables.items():
+        file_name = spec.cpta["output-file"] + "-" + job_name + "-trending"
+        with open("{0}.csv".format(file_name), 'w') as file_handler:
+            file_handler.writelines(csv_table)
+
+        txt_table = None
+        with open("{0}.csv".format(file_name), 'rb') as csv_file:
+            csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
+            line_nr = 0
+            for row in csv_content:
+                if txt_table is None:
+                    txt_table = prettytable.PrettyTable(row)
+                else:
+                    if line_nr > 1:
+                        for idx, item in enumerate(row):
+                            try:
+                                row[idx] = str(round(float(item) / 1000000, 2))
+                            except ValueError:
+                                pass
+                    try:
+                        txt_table.add_row(row)
+                    except Exception as err:
+                        logging.warning("Error occurred while generating TXT "
+                                        "table:\n{0}".format(err))
+                line_nr += 1
+            txt_table.align["Build Number:"] = "l"
+        with open("{0}.txt".format(file_name), "w") as txt_file:
+            txt_file.write(str(txt_table))
 
     # Evaluate result:
     if anomaly_classifications:
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 1b0eb36d34..abece8590b 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -845,7 +845,7 @@ def table_performance_trending_dashboard(table, input_data):
 
     file_name = "{0}{1}".format(table["output-file"], table["output-file-ext"])
 
-    logging.info("      Writing file: '{0}'".format(file_name))
+    logging.info("    Writing file: '{0}'".format(file_name))
     with open(file_name, "w") as file_handler:
         file_handler.write(header_str)
         for test in tbl_sorted:
@@ -853,7 +853,7 @@ def table_performance_trending_dashboard(table, input_data):
 
     txt_file_name = "{0}.txt".format(table["output-file"])
     txt_table = None
-    logging.info("      Writing file: '{0}'".format(txt_file_name))
+    logging.info("    Writing file: '{0}'".format(txt_file_name))
     with open(file_name, 'rb') as csv_file:
         csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
         for row in csv_content:
@@ -929,7 +929,13 @@ def table_performance_trending_dashboard_html(table, input_data):
             anchor = "#"
             feature = ""
             if c_idx == 0:
-                if "memif" in item:
+                if "lbdpdk" in item or "lbvpp" in item:
+                    file_name = "link_bonding.html"
+
+                elif "testpmd" in item or "l3fwd" in item:
+                    file_name = "dpdk.html"
+
+                elif "memif" in item:
                     file_name = "container_memif.html"
 
                 elif "srv6" in item:
@@ -992,13 +998,12 @@ def table_performance_trending_dashboard_html(table, input_data):
                 ref = ET.SubElement(td, "a", attrib=dict(href=url))
                 ref.text = item
 
-            if c_idx > 0:
+            else:
                 td.text = item
 
     try:
         with open(table["output-file"], 'w') as html_file:
-            logging.info("      Writing file: '{0}'".
-                         format(table["output-file"]))
+            logging.info("    Writing file: '{0}'".format(table["output-file"]))
             html_file.write(".. raw:: html\n\n\t")
             html_file.write(ET.tostring(dashboard))
             html_file.write("\n\t<p><br><br></p>\n")
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index beec34c106..0bb2b6ce71 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -176,7 +176,10 @@ class ExecutionChecker(ResultVisitor):
     REGEX_TOLERANCE = re.compile(r'^[\D\d]*LOSS_ACCEPTANCE:\s(\d*\.\d*)\s'
                                  r'[\D\d]*')
 
-    REGEX_VERSION = re.compile(r"(return STDOUT Version:\s*)(.*)")
+    REGEX_VERSION_VPP = re.compile(r"(return STDOUT Version:\s*)(.*)")
+
+    REGEX_VERSION_DPDK = re.compile(r"(return STDOUT testpmd)([\d\D\n]*)"
+                                    r"(RTE Version: 'DPDK )(.*)(')")
 
     REGEX_TCP = re.compile(r'Total\s(rps|cps|throughput):\s([0-9]*).*$')
 
@@ -197,6 +200,9 @@ class ExecutionChecker(ResultVisitor):
         # VPP version
         self._version = None
 
+        # Timestamp
+        self._timestamp = None
+
         # Number of VAT History messages found:
         # 0 - no message
         # 1 - VAT History of DUT1
@@ -227,7 +233,9 @@ class ExecutionChecker(ResultVisitor):
         # Dictionary defining the methods used to parse different types of
         # messages
         self.parse_msg = {
-            "setup-version": self._get_version,
+            "timestamp": self._get_timestamp,
+            "vpp-version": self._get_vpp_version,
+            "dpdk-version": self._get_dpdk_version,
             "teardown-vat-history": self._get_vat_history,
             "test-show-runtime": self._get_show_run
         }
@@ -241,7 +249,7 @@ class ExecutionChecker(ResultVisitor):
         """
         return self._data
 
-    def _get_version(self, msg):
+    def _get_vpp_version(self, msg):
         """Called when extraction of VPP version is required.
 
         :param msg: Message to process.
@@ -250,12 +258,41 @@ class ExecutionChecker(ResultVisitor):
         """
 
         if msg.message.count("return STDOUT Version:"):
-            self._version = str(re.search(self.REGEX_VERSION, msg.message).
+            self._version = str(re.search(self.REGEX_VERSION_VPP, msg.message).
                                 group(2))
             self._data["metadata"]["version"] = self._version
-            self._data["metadata"]["generated"] = msg.timestamp
             self._msg_type = None
 
+    def _get_dpdk_version(self, msg):
+        """Called when extraction of DPDK version is required.
+
+        :param msg: Message to process.
+        :type msg: Message
+        :returns: Nothing.
+        """
+
+        if msg.message.count("return STDOUT testpmd"):
+            try:
+                self._version = str(re.search(
+                    self.REGEX_VERSION_DPDK, msg.message). group(4))
+                self._data["metadata"]["version"] = self._version
+            except IndexError:
+                pass
+            finally:
+                self._msg_type = None
+
+    def _get_timestamp(self, msg):
+        """Called when extraction of timestamp is required.
+
+        :param msg: Message to process.
+        :type msg: Message
+        :returns: Nothing.
+        """
+
+        self._timestamp = msg.timestamp[:14]
+        self._data["metadata"]["generated"] = self._timestamp
+        self._msg_type = None
+
     def _get_vat_history(self, msg):
         """Called when extraction of VAT command history is required.
 
@@ -557,7 +594,11 @@ class ExecutionChecker(ResultVisitor):
             self._lookup_kw_nr += 1
             self._show_run_lookup_nr = 0
             self._msg_type = "test-show-runtime"
-            test_kw.messages.visit(self)
+        elif test_kw.name.count("Start The L2fwd Test") and not self._version:
+            self._msg_type = "dpdk-version"
+        else:
+            return
+        test_kw.messages.visit(self)
 
     def end_test_kw(self, test_kw):
         """Called when keyword ends. Default implementation does nothing.
@@ -591,8 +632,14 @@ class ExecutionChecker(ResultVisitor):
         """
         if setup_kw.name.count("Show Vpp Version On All Duts") \
                 and not self._version:
-            self._msg_type = "setup-version"
-            setup_kw.messages.visit(self)
+            self._msg_type = "vpp-version"
+
+        elif setup_kw.name.count("Setup performance global Variables") \
+                and not self._timestamp:
+            self._msg_type = "timestamp"
+        else:
+            return
+        setup_kw.messages.visit(self)
 
     def end_setup_kw(self, setup_kw):
         """Called when keyword ends. Default implementation does nothing.
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 049d57ad2d..fd127b5db3 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -29,7 +29,6 @@
     # Static html content
     DIR[STATIC]: "{DIR[BUILD,HTML]}/_static"
     DIR[STATIC,VPP]: "{DIR[STATIC]}/vpp"
-    # DIR[STATIC,DPDK]: "{DIR[STATIC]}/dpdk"
     DIR[STATIC,ARCH]: "{DIR[STATIC]}/archive"
 
     # Working directories
@@ -66,30 +65,25 @@
   type: "configuration"
 
   data-sets:
-    plot-performance-trending:
+    plot-performance-trending-all:
       csit-vpp-perf-mrr-daily-master:
-#      - 15
-#      - 20
-#      - 25
-#      - 30
-#      - 35
-#      - 40
-#      - 45
-#      - 50
-#      - 55
-#      - 60
-#      - 65
-#      - 70
-#      - 75
-#      - 80
-#      - 85
-#      - 90
-#      - 95
         start: 15
-        end: "lastCompletedBuild" # "lastSuccessfulBuild"  # take all from the 'start'
+        end: "lastCompletedBuild"
+      csit-dpdk-perf-mrr-weekly-master:
+        start: 3
+        end: "lastCompletedBuild"
+    plot-performance-trending-vpp:
+      csit-vpp-perf-mrr-daily-master:
+        start: 15
+        end: "lastCompletedBuild"
+    plot-performance-trending-dpdk:
+      csit-dpdk-perf-mrr-weekly-master:
+        start: 3
+        end: "lastCompletedBuild"
 
   plot-layouts:
-    plot-cpta:
+
+    plot-cpta-vpp:
       title: ""
       autosize: False
       showlegend: True
@@ -159,18 +153,81 @@
       hoverlabel:
         namelength: -1
 
+    plot-cpta-dpdk:
+      title: ""
+      autosize: False
+      showlegend: True
+      width: 1100
+      height: 800
+      yaxis:
+        showticklabels: True
+        tickformat: ".3s"
+        title: "Throughput [pps]"
+        hoverformat: ".4s"
+        range: []
+        gridcolor: "rgb(238, 238, 238)"
+        linecolor: "rgb(238, 238, 238)"
+        showline: True
+        zeroline: False
+        tickcolor: "rgb(238, 238, 238)"
+        linewidth: 1
+        showgrid: True
+      xaxis:
+        title: '<a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-dpdk-perf-mrr-weekly-master</a>/<a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-build</a>'
+        type: "date"
+        autorange: True
+        fixedrange: False
+        showgrid: True
+        gridcolor: "rgb(238, 238, 238)"
+        showline: True
+        linecolor: "rgb(238, 238, 238)"
+        zeroline: False
+        linewidth: 1
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
+        autotick: True
+        tickformat: "%m%d"
+        rangeselector:
+          buttons:
+          - count: 14
+            label: "2w"
+            step: "day"
+            stepmode: "backward"
+          - count: 1
+            label: "1m"
+            step: "month"
+            stepmode: "backward"
+          - count: 2
+            label: "2m"
+            step: "month"
+            stepmode: "backward"
+          - count: 3
+            label: "3m"
+            step: "month"
+            stepmode: "backward"
+          - step: "all"
+      margin:
+        r: 20
+        # b: 200
+        t: 5
+        l: 70
+      legend:
+        orientation: "h"
+        # y: -0.5
+        xanchor: "center"
+        traceorder: "normal"
+        tracegroupgap: 20
+        bordercolor: "rgb(238, 238, 238)"
+      hoverlabel:
+        namelength: -1
+
 -
   type: "static"
   src-path: "{DIR[RST]}"
   dst-path: "{DIR[WORKING,SRC]}"
 
 -
-  type: "input"  # Ignored in debug mode
-#  general:
-#    file-name: "robot-plugin.zip"
-#    file-format: ".zip"
-#    download-path: "{job}/{build}/robot/report/*zip*/{filename}"
-#    extract: "robot-plugin/output.xml"
+  type: "input"
   general:
     file-name: "output.xml.gz"
     file-format: ".gz"
@@ -178,25 +235,11 @@
     extract: "output.xml"
   builds:
     csit-vpp-perf-mrr-daily-master:
-#    - 15
-#    - 20
-#    - 25
-#    - 30
-#    - 35
-#    - 40
-#    - 45
-#    - 50
-#    - 55
-#    - 60
-#    - 65
-#    - 70
-#    - 75
-#    - 80
-#    - 85
-#    - 90
-#    - 95
       start: 15
       end: "lastCompletedBuild"  # take all from the 'start'
+    csit-dpdk-perf-mrr-weekly-master:
+      start: 3
+      end: "lastCompletedBuild"
 
 -
   type: "output"
@@ -219,7 +262,7 @@
   algorithm: "table_performance_trending_dashboard"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c"
-  data: "plot-performance-trending"
+  data: "plot-performance-trending-all"
   filter: "'MRR' and '1T1C'"
   parameters:
   - "name"
@@ -238,7 +281,7 @@
   algorithm: "table_performance_trending_dashboard"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c"
-  data: "plot-performance-trending"
+  data: "plot-performance-trending-all"
   filter: "'MRR' and '2T2C'"
   parameters:
   - "name"
@@ -257,7 +300,7 @@
   algorithm: "table_performance_trending_dashboard"
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c"
-  data: "plot-performance-trending"
+  data: "plot-performance-trending-all"
   filter: "'MRR' and '4T4C'"
   parameters:
   - "name"
@@ -303,985 +346,1140 @@
   algorithm: "cpta"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/cpta"
-  data: "plot-performance-trending"
   plots:
 
 # L2 - x520
 
     - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # L2 - xl710
 
     - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-1t1c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # L2 - x710
 
     - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPv4 - x520
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPv4 - xl710
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-1t1c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPv4 - x710
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPv4 Tunnels - x520
 
     - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPv4 Tunnels - x710
 
     - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPv6 - x520
 
     - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPv6 - xl710
 
     - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-1t1c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPv6 - x710
 
     - title: "VPP 1T1C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
 # Container memif - x520, IMIX
 
     - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-2t2c-x520"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-4t4c-x520"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x520"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x520"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
 
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-x520"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-x520"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
 
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
 
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-xl710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-xl710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
 
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-xl710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-xl710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-2t2c-x710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-4t4c-x710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
 
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-x710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-x710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # 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"
+      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'"
 
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-x710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-x710"
-      data: "plot-performance-trending"
+      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'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # IPSec
 
     - title: "VPP 1T1C IPSec 64B Packet Throughput - Trending"
       output-file-name: "ipsec-1t1c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C IPSec 64B Packet Throughput - Trending"
       output-file-name: "ipsec-2t2c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       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"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C IPSec 64B Packet Throughput - Trending"
       output-file-name: "ipsec-4t4c-xl710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # SRv6 - x520
 
     - title: "VPP 1T1C SRv6 78B MRR Trending"
       output-file-name: "srv6-78b-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C SRv6 78B MRR Trending"
       output-file-name: "srv6-78b-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C SRv6 78B MRR Trending"
       output-file-name: "srv6-78b-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 1T1C SRv6 IMIX MRR Trending"
       output-file-name: "srv6-imix-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C SRv6 IMIX MRR Trending"
       output-file-name: "srv6-imix-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C SRv6 IMIX MRR Trending"
       output-file-name: "srv6-imix-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # Link Bonding - x520
 
     - title: "VPP 1T1C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 1T1C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-1t1c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-2t2c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-4t4c-x520"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
 # Link Bonding - x710
 
     - title: "VPP 1T1C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 1T1C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-1t1c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 2T2C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-2t2c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
 
     - title: "VPP 4T4C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-4t4c-x710"
-      data: "plot-performance-trending"
+      data: "plot-performance-trending-vpp"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta"
+      layout: "plot-cpta-vpp"
+
+# DPDK - x520 - 64B
+
+    - title: "DPDK 1T1C 64B MRR Trending"
+      output-file-name: "dpdk-64b-1t1c-x520"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 2T2C 64B MRR Trending"
+      output-file-name: "dpdk-64b-2t2c-x520"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 4T4C 64B MRR Trending"
+      output-file-name: "dpdk-64b-4t4c-x520"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+# DPDK - x710 - 64B
+
+    - title: "DPDK 1T1C 64B MRR Trending"
+      output-file-name: "dpdk-64b-1t1c-x710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 2T2C 64B MRR Trending"
+      output-file-name: "dpdk-64b-2t2c-x710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 4T4C 64B MRR Trending"
+      output-file-name: "dpdk-64b-4t4c-x710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+# DPDK - xl710 - 64B
+
+    - title: "DPDK 1T1C 64B MRR Trending"
+      output-file-name: "dpdk-64b-1t1c-xl710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 2T2C 64B MRR Trending"
+      output-file-name: "dpdk-64b-2t2c-xl710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 4T4C 64B MRR Trending"
+      output-file-name: "dpdk-64b-4t4c-xl710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+# DPDK - x520 - IMIX
+
+    - title: "DPDK 1T1C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-1t1c-x520"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 2T2C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-2t2c-x520"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 4T4C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-4t4c-x520"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+# DPDK - x710 - IMIX
+
+    - title: "DPDK 1T1C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-1t1c-x710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 2T2C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-2t2c-x710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 4T4C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-4t4c-x710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+# DPDK - xl710 - IMIX
+
+    - title: "DPDK 1T1C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-1t1c-xl710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 2T2C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-2t2c-xl710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"
+
+    - title: "DPDK 4T4C IMIX MRR Trending"
+      output-file-name: "dpdk-imix-4t4c-xl710"
+      data: "plot-performance-trending-dpdk"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
+      parameters:
+      - "result"
+      layout: "plot-cpta-dpdk"