CSIT-1124: Support multi-sample tests

[csit.git] / resources / tools / presentation / specification_CPTA.yaml

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index fd127b5..35b61cf 100644 (file)
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -83,7 +83,7 @@
 
   plot-layouts:
 
-    plot-cpta-vpp:
+    plot-cpta:
       title: ""
       autosize: False
       showlegend: True
@@ -91,7 +91,7 @@
       height: 800
       yaxis:
         showticklabels: True
-        tickformat: ".3s"
+        tickformat: ".4s"
         title: "Throughput [pps]"
         hoverformat: ".4s"
         range: []
@@ -103,7 +103,7 @@
         linewidth: 1
         showgrid: True
       xaxis:
-        title: '<a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-vpp-perf-mrr-daily-master-build</a>/<a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-build</a>'
+        title: 'Date [MMDD]'
         type: "date"
         autorange: True
         fixedrange: False
@@ -136,88 +136,17 @@
             step: "month"
             stepmode: "backward"
           - step: "all"
-        # rangeslider: {}
       margin:
         r: 20
-        # b: 200
+        b: 5
         t: 5
         l: 70
       legend:
         orientation: "h"
-        # y: -0.5
         xanchor: "center"
         traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
         tracegroupgap: 20
         bordercolor: "rgb(238, 238, 238)"
-        # borderwidth: 1
-      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
 
@@ -269,6 +198,8 @@
   - "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-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
   window: 14
@@ -288,6 +219,8 @@
   - "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-2t2c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
   window: 14
@@ -307,6 +240,8 @@
   - "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-4t4c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
   window: 14
@@ -334,6 +269,31 @@
   input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c.csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c.rst"
 
+-
+  type: "table"
+  title: "Failed MRR tests"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests"
+  data: "plot-performance-trending-all"
+  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-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
+  window: 14
+
+-
+  type: "table"
+  title: "HTML Failed MRR tests"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests.rst"
+
 
 ################################################################################
 ###                                 C P T A                                  ###
@@ -343,7 +303,6 @@
 -
   type: "cpta"
   title: "Continuous Performance Trending and Analysis"
-  algorithm: "cpta"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/cpta"
   plots:
@@ -356,7 +315,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-x520"
@@ -364,7 +323,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-x520"
@@ -372,7 +331,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-1t1c-x520"
@@ -380,7 +339,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-2t2c-x520"
@@ -388,7 +347,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-4t4c-x520"
@@ -396,7 +355,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # L2 - xl710
 
@@ -406,7 +365,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-xl710"
@@ -414,7 +373,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-xl710"
@@ -422,7 +381,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # L2 - x710
 
@@ -432,7 +391,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-2t2c-x710"
@@ -440,7 +399,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-4t4c-x710"
@@ -448,7 +407,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 1T1C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-1t1c-x710"
@@ -456,7 +415,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-2t2c-x710"
@@ -464,7 +423,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - Trending"
       output-file-name: "l2-feature-4t4c-x710"
@@ -472,7 +431,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPv4 - x520
 
@@ -482,7 +441,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-x520"
@@ -490,7 +449,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-x520"
@@ -498,7 +457,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-1t1c-x520"
@@ -506,7 +465,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-2t2c-x520"
@@ -514,7 +473,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-4t4c-x520"
@@ -522,7 +481,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPv4 - xl710
 
@@ -532,7 +491,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-xl710"
@@ -540,7 +499,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-xl710"
@@ -548,7 +507,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPv4 - x710
 
@@ -558,7 +517,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-2t2c-x710"
@@ -566,7 +525,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-4t4c-x710"
@@ -574,7 +533,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-1t1c-x710"
@@ -582,7 +541,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-2t2c-x710"
@@ -590,7 +549,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - Trending"
       output-file-name: "ip4-feature-4t4c-x710"
@@ -598,7 +557,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPv4 Tunnels - x520
 
@@ -608,7 +567,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-2t2c-x520"
@@ -616,7 +575,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-4t4c-x520"
@@ -624,7 +583,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPv4 Tunnels - x710
 
@@ -634,7 +593,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-2t2c-x710"
@@ -642,7 +601,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - Trending"
       output-file-name: "ip4-tunnels-4t4c-x710"
@@ -650,7 +609,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPv6 - x520
 
@@ -660,7 +619,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-x520"
@@ -668,7 +627,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-x520"
@@ -676,7 +635,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPv6 - xl710
 
@@ -686,7 +645,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-xl710"
@@ -694,7 +653,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-xl710"
@@ -702,7 +661,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPv6 - x710
 
@@ -712,7 +671,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-2t2c-x710"
@@ -720,7 +679,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - Trending"
       output-file-name: "ip6-4t4c-x710"
@@ -728,7 +687,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # Container memif - x520, 64B
 
@@ -738,7 +697,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-x520"
@@ -746,7 +705,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-x520"
@@ -754,7 +713,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # Container memif - x520, IMIX
 
@@ -764,7 +723,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-x520"
@@ -772,7 +731,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-x520"
@@ -780,7 +739,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # Container memif - xl710, 64B
 
@@ -790,7 +749,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-xl710"
@@ -798,7 +757,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-xl710"
@@ -806,7 +765,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # Container memif - xl710, IMIX
 
@@ -816,7 +775,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-xl710"
@@ -824,7 +783,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-xl710"
@@ -832,7 +791,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # Container memif - x710, 64B
 
@@ -842,7 +801,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-2t2c-x710"
@@ -850,7 +809,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - Trending"
       output-file-name: "container-memif-l2-4t4c-x710"
@@ -858,7 +817,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # Container memif - x520, IMIX
 
@@ -868,7 +827,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-2t2c-x710"
@@ -876,7 +835,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - Trending"
       output-file-name: "container-memif-imix-l2-4t4c-x710"
@@ -884,7 +843,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, 64B
 
@@ -894,7 +853,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-2t2c-x520"
@@ -902,7 +861,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-4t4c-x520"
@@ -910,7 +869,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, IMIX
 
@@ -920,7 +879,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x520"
@@ -928,7 +887,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x520"
@@ -936,7 +895,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - x520, eth, 64B
 
@@ -947,7 +906,7 @@
 
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-x520"
@@ -955,7 +914,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-x520"
@@ -963,7 +922,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - x520, eth, IMIX
 
@@ -974,7 +933,7 @@
 
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520"
@@ -982,7 +941,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520"
@@ -990,7 +949,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - xl710, eth, 64B
 
@@ -1001,7 +960,7 @@
 
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-xl710"
@@ -1009,7 +968,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-xl710"
@@ -1017,7 +976,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - xl710, eth, IMIX
 
@@ -1028,7 +987,7 @@
 
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-xl710"
@@ -1036,7 +995,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-xl710"
@@ -1044,7 +1003,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
@@ -1054,7 +1013,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-2t2c-x710"
@@ -1062,7 +1021,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-ethip4-4t4c-x710"
@@ -1070,7 +1029,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, IMIX
 
@@ -1080,7 +1039,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x710"
@@ -1088,7 +1047,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x710"
@@ -1096,7 +1055,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - x710, eth, 64B
 
@@ -1107,7 +1066,7 @@
 
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-2t2c-x710"
@@ -1115,7 +1074,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - Trending"
       output-file-name: "vm-vhost-eth-4t4c-x710"
@@ -1123,7 +1082,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # VM vhost - x710, eth, IMIX
 
@@ -1134,7 +1093,7 @@
 
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-2t2c-x710"
@@ -1142,7 +1101,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - Trending"
       output-file-name: "vm-vhost-imix-eth-4t4c-x710"
@@ -1150,7 +1109,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # IPSec
 
@@ -1160,7 +1119,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C IPSec 64B Packet Throughput - Trending"
       output-file-name: "ipsec-2t2c-xl710"
@@ -1168,7 +1127,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C IPSec 64B Packet Throughput - Trending"
       output-file-name: "ipsec-4t4c-xl710"
@@ -1176,7 +1135,7 @@
       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-vpp"
+      layout: "plot-cpta"
 
 # SRv6 - x520
 
@@ -1186,7 +1145,7 @@
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C SRv6 78B MRR Trending"
       output-file-name: "srv6-78b-2t2c-x520"
@@ -1194,7 +1153,7 @@
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C SRv6 78B MRR Trending"
       output-file-name: "srv6-78b-4t4c-x520"
@@ -1202,7 +1161,7 @@
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 1T1C SRv6 IMIX MRR Trending"
       output-file-name: "srv6-imix-1t1c-x520"
@@ -1210,7 +1169,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C SRv6 IMIX MRR Trending"
       output-file-name: "srv6-imix-2t2c-x520"
@@ -1218,7 +1177,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C SRv6 IMIX MRR Trending"
       output-file-name: "srv6-imix-4t4c-x520"
@@ -1226,7 +1185,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
 # Link Bonding - x520
 
@@ -1236,7 +1195,7 @@
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-2t2c-x520"
@@ -1244,7 +1203,7 @@
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-4t4c-x520"
@@ -1252,7 +1211,7 @@
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 1T1C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-1t1c-x520"
@@ -1260,7 +1219,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-2t2c-x520"
@@ -1268,7 +1227,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-4t4c-x520"
@@ -1276,7 +1235,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
 # Link Bonding - x710
 
@@ -1286,7 +1245,7 @@
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-2t2c-x710"
@@ -1294,7 +1253,7 @@
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C Link Bonding 64B MRR Trending"
       output-file-name: "lb-64b-4t4c-x710"
@@ -1302,7 +1261,7 @@
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 1T1C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-1t1c-x710"
@@ -1310,7 +1269,7 @@
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 2T2C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-2t2c-x710"
@@ -1318,7 +1277,7 @@
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
     - title: "VPP 4T4C Link Bonding IMIX MRR Trending"
       output-file-name: "lb-imix-4t4c-x710"
@@ -1326,7 +1285,7 @@
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
       parameters:
       - "result"
-      layout: "plot-cpta-vpp"
+      layout: "plot-cpta"
 
 # DPDK - x520 - 64B
 
@@ -1336,7 +1295,7 @@
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 2T2C 64B MRR Trending"
       output-file-name: "dpdk-64b-2t2c-x520"
@@ -1344,7 +1303,7 @@
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 4T4C 64B MRR Trending"
       output-file-name: "dpdk-64b-4t4c-x520"
@@ -1352,7 +1311,7 @@
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
 # DPDK - x710 - 64B
 
@@ -1362,7 +1321,7 @@
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 2T2C 64B MRR Trending"
       output-file-name: "dpdk-64b-2t2c-x710"
@@ -1370,7 +1329,7 @@
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 4T4C 64B MRR Trending"
       output-file-name: "dpdk-64b-4t4c-x710"
@@ -1378,7 +1337,7 @@
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
 # DPDK - xl710 - 64B
 
@@ -1388,7 +1347,7 @@
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 2T2C 64B MRR Trending"
       output-file-name: "dpdk-64b-2t2c-xl710"
@@ -1396,7 +1355,7 @@
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 4T4C 64B MRR Trending"
       output-file-name: "dpdk-64b-4t4c-xl710"
@@ -1404,7 +1363,7 @@
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
 # DPDK - x520 - IMIX
 
@@ -1414,7 +1373,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 2T2C IMIX MRR Trending"
       output-file-name: "dpdk-imix-2t2c-x520"
@@ -1422,7 +1381,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 4T4C IMIX MRR Trending"
       output-file-name: "dpdk-imix-4t4c-x520"
@@ -1430,7 +1389,7 @@
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
 # DPDK - x710 - IMIX
 
@@ -1440,7 +1399,7 @@
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 2T2C IMIX MRR Trending"
       output-file-name: "dpdk-imix-2t2c-x710"
@@ -1448,7 +1407,7 @@
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 4T4C IMIX MRR Trending"
       output-file-name: "dpdk-imix-4t4c-x710"
@@ -1456,7 +1415,7 @@
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
 # DPDK - xl710 - IMIX
 
@@ -1466,7 +1425,7 @@
       filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 2T2C IMIX MRR Trending"
       output-file-name: "dpdk-imix-2t2c-xl710"
@@ -1474,7 +1433,7 @@
       filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"
 
     - title: "DPDK 4T4C IMIX MRR Trending"
       output-file-name: "dpdk-imix-4t4c-xl710"
@@ -1482,4 +1441,4 @@
       filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"