X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=77fee3506ab68e1e1a6f73519e69519371ae5361;hp=d53a46e7e88fd952f4d455ab5f8830dd580a4442;hb=7aff808942440ba9729bf60888738b920c024324;hpb=7521314f034cf37a49b1205bb640a2cb8b48c569

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index d53a46e7e8..77fee3506a 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -89,7 +89,8 @@
       height: 800
       yaxis:
         showticklabels: True
-        title: "Throughput [Mpps]"
+        tickformat: ".3s"
+        title: "Throughput [pps]"
         hoverformat: ".4s"
         range: []
         gridcolor: "rgb(238, 238, 238)"
@@ -101,7 +102,8 @@
         showgrid: True
       xaxis:
         showticklabels: True
-        title: "VPP Performance Trending Job ID"
+        # title: "csit-vpp-perf-mrr-daily-master/vpp-build"
+        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>'
         autorange: True
         showgrid: True
         gridcolor: "rgb(238, 238, 238)"
@@ -109,13 +111,14 @@
         fixedrange: False
         zeroline: False
         tickcolor: "rgb(238, 238, 238)"
+        # tickangle: 0
         showline: True
         linewidth: 1
         autotick: True
       margin:
         r: 20
         b: 50
-        t: 50
+        t: 5
         l: 70
       legend:
         orientation: "h"
@@ -203,6 +206,95 @@
     pdf:
     - minimal
 
+################################################################################
+###                               T A B L E S                                ###
+################################################################################
+
+-
+  type: "table"
+  title: "Performance trending dashboard"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c"
+  data: "plot-performance-trending"
+  filter: "'MRR' and '1T1C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  # Number of the best and the worst tests presented in the table. Use 0 (zero)
+  # to present all tests.
+  nr-of-tests-shown: 20
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+  long-trend-threshold: 80  # Percent of the highest moving median value
+
+-
+  type: "table"
+  title: "Performance trending dashboard"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c"
+  data: "plot-performance-trending"
+  filter: "'MRR' and '2T2C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  # Number of the best and the worst tests presented in the table. Use 0 (zero)
+  # to present all tests.
+  nr-of-tests-shown: 20
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+  long-trend-threshold: 80  # Percent of the highest moving median value
+
+-
+  type: "table"
+  title: "Performance trending dashboard"
+  algorithm: "table_performance_trending_dashboard"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c"
+  data: "plot-performance-trending"
+  filter: "'MRR' and '4T4C'"
+  parameters:
+  - "name"
+  - "parent"
+  - "result"
+  # Number of the best and the worst tests presented in the table. Use 0 (zero)
+  # to present all tests.
+  nr-of-tests-shown: 20
+  outlier-const: 1.5
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+  long-trend-threshold: 80  # Percent of the highest moving median value
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c.rst"
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t2c"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c.rst"
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 4t4c"
+  algorithm: "table_performance_trending_dashboard_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c.rst"
+
+
 ################################################################################
 ###                                 C P T A                                  ###
 ################################################################################
@@ -217,7 +309,7 @@
   data: "plot-performance-trending"
   plots:
 
-# L2
+# L2 - x520
 
     - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
       output-file-name: "l2-1t1c-x520"
@@ -227,8 +319,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -239,8 +331,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
@@ -251,8 +343,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
@@ -263,8 +355,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -275,8 +367,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
@@ -287,10 +379,12 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+# L2 - xl710
+
     - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
       output-file-name: "l2-1t1c-xl710"
       data: "plot-performance-trending"
@@ -299,8 +393,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -311,8 +405,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
@@ -323,10 +417,12 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+# L2 - x710
+
     - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
       output-file-name: "l2-1t1c-x710"
       data: "plot-performance-trending"
@@ -335,8 +431,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -347,8 +443,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
@@ -359,11 +455,47 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
+      output-file-name: "l2-feature-1t1c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
+      output-file-name: "l2-feature-2t2c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
+      output-file-name: "l2-feature-4t4c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-# IPv4
+# IPv4 - x520
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-1t1c-x520"
@@ -373,8 +505,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
@@ -385,8 +517,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
@@ -397,8 +529,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
@@ -409,8 +541,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
@@ -421,8 +553,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
@@ -433,10 +565,12 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+# IPv4 - xl710
+
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-1t1c-xl710"
       data: "plot-performance-trending"
@@ -445,8 +579,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
@@ -457,8 +591,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
@@ -469,11 +603,85 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# IPv4 - x710
+
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-feature-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-# IPv4 Tunnels
+    - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-feature-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-feature-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# IPv4 Tunnels - x520
 
     - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-tunnels-1t1c-x520"
@@ -483,8 +691,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
@@ -495,8 +703,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
@@ -507,11 +715,49 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# IPv4 Tunnels - x710
+
+    - title: "VPP 1T1C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-tunnels-1t1c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-tunnels-2t2c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-# IPv6
+    - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
+      output-file-name: "ip4-tunnels-4t4c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# IPv6 - x520
 
     - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
       output-file-name: "ip6-1t1c-x520"
@@ -521,8 +767,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
@@ -533,8 +779,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
@@ -545,10 +791,12 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+# IPv6 - xl710
+
     - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
       output-file-name: "ip6-1t1c-xl710"
       data: "plot-performance-trending"
@@ -557,8 +805,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
@@ -569,8 +817,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
@@ -581,11 +829,49 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# IPv6 - x710
+
+    - title: "VPP 1T1C IPv6 78B Packet Throughput - {period} Trending"
+      output-file-name: "ip6-1t1c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
+      output-file-name: "ip6-2t2c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
+      output-file-name: "ip6-4t4c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-# Container memif
+# Container memif - x520, 64B
 
     - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
       output-file-name: "container-memif-l2-1t1c-x520"
@@ -595,8 +881,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
@@ -607,8 +893,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
@@ -619,10 +905,50 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# Container memif - x520, IMIX
+
+    - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-imix-l2-1t1c-x520"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-imix-l2-2t2c-x520"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-imix-l2-4t4c-x520"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+# Container memif - xl710, 64B
+
     - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
       output-file-name: "container-memif-l2-1t1c-xl710"
       data: "plot-performance-trending"
@@ -631,8 +957,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
@@ -643,8 +969,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
@@ -655,83 +981,125 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+# Container memif - xl710, IMIX
+
     - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-1t1c-x520"
+      output-file-name: "container-memif-imix-l2-1t1c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-2t2c-x520"
+      output-file-name: "container-memif-imix-l2-2t2c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-4t4c-x520"
+      output-file-name: "container-memif-imix-l2-4t4c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# Container memif - x710, 64B
+
+    - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-l2-1t1c-x710"
+      data: "plot-performance-trending"
+      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"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+    - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-l2-2t2c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-l2-4t4c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# Container memif - x520, IMIX
+
     - title: "VPP 1T1C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-1t1c-xl710"
+      output-file-name: "container-memif-imix-l2-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-2t2c-xl710"
+      output-file-name: "container-memif-imix-l2-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
-      output-file-name: "container-memif-imix-l2-4t4c-xl710"
+      output-file-name: "container-memif-imix-l2-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-# VM vhost
+# VM vhost - x520, ethip4, 64B
 
     - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-ethip4-1t1c-x520"
@@ -741,8 +1109,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - {period} Trending"
@@ -753,8 +1121,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - {period} Trending"
@@ -765,10 +1133,50 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# VM vhost - x520, ethip4, IMIX
+
+    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-1t1c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-2t2c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-4t4c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# VM vhost - x520, eth, 64B
+
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-1t1c-x520"
       data: "plot-performance-trending"
@@ -778,8 +1186,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
@@ -790,8 +1198,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
@@ -802,10 +1210,51 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+# VM vhost - x520, eth, IMIX
+
+    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-1t1c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-2t2c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-4t4c-x520"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# VM vhost - xl710, eth, 64B
+
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-1t1c-xl710"
       data: "plot-performance-trending"
@@ -815,8 +1264,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
@@ -827,8 +1276,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
@@ -839,157 +1288,166 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-eth-1t1c-x710"
+# VM vhost - xl710, eth, IMIX
+
+    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-1t1c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
 
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-eth-2t2c-x710"
+    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-2t2c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-eth-4t4c-x710"
+    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-eth-4t4c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-ethip4-1t1c-x520"
+# VM vhost - x710, ethip4, 64B
+
+    - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-ethip4-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-ethip4-2t2c-x520"
+    - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-ethip4-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-ethip4-4t4c-x520"
+    - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-ethip4-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x520"
-      data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+# VM vhost - x710, ethip4, IMIX
 
+    - title: "VPP 1T1C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-1t1c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x520"
+    - title: "VPP 2T2C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x520"
+    - title: "VPP 4T4C VM vhost ethip4 IMIX Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-imix-ethip4-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-1t1c-xl710"
+# VM vhost - x710, eth, 64B
+
+    - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-eth-1t1c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
 
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-2t2c-xl710"
+    - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-eth-2t2c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
-      output-file-name: "vm-vhost-imix-eth-4t4c-xl710"
+    - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-eth-4t4c-x710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
       parameters:
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
+# VM vhost - x710, eth, IMIX
+
     - title: "VPP 1T1C VM vhost eth IMIX Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-imix-eth-1t1c-x710"
       data: "plot-performance-trending"
@@ -999,8 +1457,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth IMIX Packet Throughput - {period} Trending"
@@ -1011,8 +1469,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth IMIX Packet Throughput - {period} Trending"
@@ -1023,8 +1481,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
 # IPSec
@@ -1037,8 +1495,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPSec 64B Packet Throughput - {period} Trending"
@@ -1049,8 +1507,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPSec 64B Packet Throughput - {period} Trending"
@@ -1061,6 +1519,6 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"