X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=9ea9bc7bf43c57bc00f1af34226934ffcb4f8c6b;hp=61014257838c8b956fe1ace8b67d3d0ad10f16eb;hb=b6de6fb4bcf50cd347df181121602db9ac2c9eec;hpb=fe3b245f128cb3204cbf57e2e474f006f7ceacd5

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 6101425783..9ea9bc7bf4 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -56,7 +56,7 @@
     URL[JENKINS,CSIT]: "https://jenkins.fd.io/view/csit/job"
     URL[NEXUS,LOG]: "https://logs.fd.io/production/vex-yul-rot-jenkins-1"
     URL[NEXUS]: "https://docs.fd.io/csit"
-    DIR[NEXUS]: "report/_static/archive"
+    DIR[NEXUS]: "trending/_static/archive"
 
   make-dirs:
   # List the directories which are created while preparing the environment.
@@ -78,7 +78,7 @@
     plot-performance-trending:
       csit-vpp-perf-mrr-daily-master:
         start: 15
-        end: "lastCompletedBuild" # "lastSuccessfulBuild"  # take all from the 'start'
+        end: 17 #"lastCompletedBuild" # "lastSuccessfulBuild"  # take all from the 'start'
 
   plot-layouts:
     plot-cpta:
@@ -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
+        b: 100
+        t: 5
         l: 70
       legend:
         orientation: "h"
@@ -179,7 +182,7 @@
 -
   type: "input"  # Ignored in debug mode
   general:
-    file-name: "output.xml.log.gz"
+    file-name: "output.xml.gz"
     file-format: ".gz"
     download-path: "{job}/{build}/archives/{filename}"
     extract: "output.xml"
@@ -190,7 +193,7 @@
   builds:
     csit-vpp-perf-mrr-daily-master:
       start: 15
-      end: "lastCompletedBuild"  # take all from the 'start'
+      end: 17 #"lastCompletedBuild"  # take all from the 'start'
 
 -
   type: "output"
@@ -203,6 +206,65 @@
     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: 10
+
+-
+  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: 10
+
+-
+  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: 10
+
+
 ################################################################################
 ###                                 C P T A                                  ###
 ################################################################################
@@ -217,7 +279,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 +289,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -239,8 +301,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
@@ -251,8 +313,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 1T1C L2 64B Packet Throughput - {period} Trending"
@@ -263,8 +325,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -275,8 +337,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
@@ -287,10 +349,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 +363,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -311,8 +375,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
@@ -323,11 +387,85 @@
       - "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"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
+      output-file-name: "l2-2t2c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 64B Packet Throughput - {period} Trending"
+      output-file-name: "l2-4t4c-x710"
+      data: "plot-performance-trending"
+      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"
+      periods:
+      - 1
+      # - 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"
@@ -337,8 +475,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
@@ -349,8 +487,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
@@ -361,8 +499,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
@@ -373,8 +511,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
@@ -385,8 +523,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
@@ -397,10 +535,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"
@@ -409,8 +549,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
@@ -421,8 +561,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
@@ -433,11 +573,85 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-# IPv4 Tunnels
+# 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"
+
+    - 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"
@@ -447,8 +661,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
@@ -459,8 +673,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 Tunnels 64B Packet Throughput - {period} Trending"
@@ -471,11 +685,49 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-# IPv6
+# 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"
+
+    - 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"
@@ -485,8 +737,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
@@ -497,8 +749,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
@@ -509,10 +761,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"
@@ -521,8 +775,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv6 78B Packet Throughput - {period} Trending"
@@ -533,8 +787,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv6 78B Packet Throughput - {period} Trending"
@@ -545,11 +799,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"
 
-# Container memif
+    - 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 - x520, 64B
 
     - title: "VPP 1T1C L2 Container memif 64B Packet Throughput - {period} Trending"
       output-file-name: "container-memif-l2-1t1c-x520"
@@ -559,8 +851,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
@@ -571,8 +863,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
@@ -583,10 +875,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"
@@ -595,8 +927,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 Container memif 64B Packet Throughput - {period} Trending"
@@ -607,8 +939,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C L2 Container memif 64B Packet Throughput - {period} Trending"
@@ -619,11 +951,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-xl710"
+      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'"
+      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-xl710"
+      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'"
+      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-xl710"
+      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'"
+      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
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
-# VM vhost
+    - 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-x710"
+      data: "plot-performance-trending"
+      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
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 Container memif IMIX Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-imix-l2-2t2c-x710"
+      data: "plot-performance-trending"
+      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
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 Container memif IMIX Packet Throughput - {period} Trending"
+      output-file-name: "container-memif-imix-l2-4t4c-x710"
+      data: "plot-performance-trending"
+      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
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# VM vhost - x520, ethip4, 64B
 
     - title: "VPP 1T1C VM vhost ethip4 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-ethip4-1t1c-x520"
@@ -633,8 +1079,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost ethip4 64B Packet Throughput - {period} Trending"
@@ -645,8 +1091,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost ethip4 64B Packet Throughput - {period} Trending"
@@ -657,10 +1103,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"
@@ -670,8 +1156,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
@@ -682,8 +1168,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
@@ -694,10 +1180,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"
@@ -707,8 +1234,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
@@ -719,8 +1246,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
@@ -731,8 +1258,201 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# 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-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
+      # - 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"
+      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'"
+      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-xl710"
+      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'"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# 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-X710' and '64B' 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 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-ethip4-2t2c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and '64B' 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 64B Packet Throughput - {period} Trending"
+      output-file-name: "vm-vhost-ethip4-4t4c-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
+      parameters:
+      - "result"
+      periods:
+      - 1
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+# 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
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - 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-X710' 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-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' 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 - 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-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
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - 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-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
+      # - 14
+      # - 60
+      layout: "plot-cpta"
+
+    - 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-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
+      # - 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"
+      filter: "'NIC_Intel-X710' 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-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' 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-x710"
+      data: "plot-performance-trending"
+      filter: "'NIC_Intel-X710' 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"
 
 # IPSec
@@ -745,8 +1465,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPSec 64B Packet Throughput - {period} Trending"
@@ -757,8 +1477,8 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPSec 64B Packet Throughput - {period} Trending"
@@ -769,6 +1489,6 @@
       - "result"
       periods:
       - 1
-      - 5
-      - 30
+      # - 14
+      # - 60
       layout: "plot-cpta"