X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=35b61cfcceb50e07fbd0d04a3e3c37008b298595;hb=4b0df8e7baea755e2e1a1c27a7707fb0a3f28b6e;hp=19011658c69c4aa628c008c50ea7c2c1bc98244a;hpb=401af1e0e6bddb4ad2aed28de66f13ece2436937;p=csit.git

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 19011658c6..35b61cfcce 100644
--- 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                                  ###
@@ -355,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"
@@ -363,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"
@@ -371,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"
@@ -379,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"
@@ -387,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"
@@ -395,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
 
@@ -405,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"
@@ -413,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"
@@ -421,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
 
@@ -431,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"
@@ -439,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"
@@ -447,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"
@@ -455,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"
@@ -463,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"
@@ -471,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
 
@@ -481,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"
@@ -489,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"
@@ -497,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"
@@ -505,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"
@@ -513,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"
@@ -521,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
 
@@ -531,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"
@@ -539,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"
@@ -547,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
 
@@ -557,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"
@@ -565,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"
@@ -573,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"
@@ -581,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"
@@ -589,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"
@@ -597,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
 
@@ -607,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"
@@ -615,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"
@@ -623,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
 
@@ -633,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"
@@ -641,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"
@@ -649,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
 
@@ -659,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"
@@ -667,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"
@@ -675,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
 
@@ -685,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"
@@ -693,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"
@@ -701,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
 
@@ -711,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"
@@ -719,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"
@@ -727,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
 
@@ -737,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"
@@ -745,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"
@@ -753,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
 
@@ -763,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"
@@ -771,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"
@@ -779,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
 
@@ -789,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"
@@ -797,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"
@@ -805,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
 
@@ -815,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"
@@ -823,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"
@@ -831,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
 
@@ -841,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"
@@ -849,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"
@@ -857,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
 
@@ -867,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"
@@ -875,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"
@@ -883,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
 
@@ -893,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"
@@ -901,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"
@@ -909,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
 
@@ -919,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"
@@ -927,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"
@@ -935,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
 
@@ -946,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"
@@ -954,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"
@@ -962,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
 
@@ -973,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"
@@ -981,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"
@@ -989,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
 
@@ -1000,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"
@@ -1008,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"
@@ -1016,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
 
@@ -1027,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"
@@ -1035,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"
@@ -1043,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
 
@@ -1053,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"
@@ -1061,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"
@@ -1069,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
 
@@ -1079,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"
@@ -1087,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"
@@ -1095,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
 
@@ -1106,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"
@@ -1114,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"
@@ -1122,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
 
@@ -1133,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"
@@ -1141,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"
@@ -1149,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
 
@@ -1159,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"
@@ -1167,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"
@@ -1175,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
 
@@ -1185,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"
@@ -1193,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"
@@ -1201,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"
@@ -1209,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"
@@ -1217,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"
@@ -1225,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
 
@@ -1235,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"
@@ -1243,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"
@@ -1251,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"
@@ -1259,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"
@@ -1267,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"
@@ -1275,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
 
@@ -1285,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"
@@ -1293,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"
@@ -1301,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"
@@ -1309,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"
@@ -1317,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"
@@ -1325,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
 
@@ -1335,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"
@@ -1343,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"
@@ -1351,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
 
@@ -1361,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"
@@ -1369,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"
@@ -1377,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
 
@@ -1387,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"
@@ -1395,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"
@@ -1403,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
 
@@ -1413,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"
@@ -1421,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"
@@ -1429,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
 
@@ -1439,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"
@@ -1447,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"
@@ -1455,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
 
@@ -1465,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"
@@ -1473,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"
@@ -1481,4 +1441,4 @@
       filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'DPDK'"
       parameters:
       - "result"
-      layout: "plot-cpta-dpdk"
+      layout: "plot-cpta"