X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=bba7d43b7b5f483e5bbd5ac16f92723734d099a3;hb=a76fb6bd39a0a6ec6183bfb6da9c3ebefb248f33;hp=aa29cec15b5aea85f729f3fbccf0126ff69e1ca8;hpb=4a40c75ffc9f6b62a2eb58007675ef17f4c32b1e;p=csit.git

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index aa29cec15b..bba7d43b7b 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -16,15 +16,6 @@
 
 -
   type: "environment"
-  configuration:
-    # Debug mode:
-    # - Skip:
-    #   - Download of input data files
-    # - Do:
-    #   - Read data from given zip / xml files
-    #   - Set the configuration as it is done in normal mode
-    # If the section "type: debug" is missing, CFG[DEBUG] is set to 0.
-    CFG[DEBUG]: 0
 
   paths:
     # Top level directories:
@@ -90,7 +81,7 @@
       yaxis:
         showticklabels: True
         tickformat: ".3s"
-        title: "Throughput [Mpps]"
+        title: "Throughput [pps]"
         hoverformat: ".4s"
         range: []
         gridcolor: "rgb(238, 238, 238)"
@@ -101,77 +92,47 @@
         linewidth: 1
         showgrid: True
       xaxis:
-        showticklabels: True
-        title: "/csit/job/{job}/$id"
+        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>'
+        type: "date"
         autorange: True
+        fixedrange: False
         showgrid: True
         gridcolor: "rgb(238, 238, 238)"
+        showline: True
         linecolor: "rgb(238, 238, 238)"
-        fixedrange: False
         zeroline: False
-        tickcolor: "rgb(238, 238, 238)"
-        showline: True
         linewidth: 1
+        showticklabels: True
+        tickcolor: "rgb(238, 238, 238)"
         autotick: True
+        # tickformat: "%m%d"
+        rangeselector:
+          buttons:
+          - count: 1
+            label: "1m"
+            step: "month"
+            stepmode: "backward"
+          - count: 3
+            label: "3m"
+            step: "month"
+            stepmode: "backward"
+          - step: "all"
+        rangeslider: {}
       margin:
         r: 20
-        b: 50
-        t: 50
+        b: 200
+        t: 5
         l: 70
       legend:
         orientation: "h"
         traceorder: "normal"
+        y: -0.5
 #        tracegroupgap: 10
 #        bordercolor: "rgb(238, 238, 238)"
 #        borderwidth: 1
       hoverlabel:
         namelength: -1
 
--
-  type: "debug"
-  general:
-    input-format: "xml"  # zip or xml
-    extract: "robot-plugin/output.xml"  # Only for zip
-  builds:
-    # The files must be in the directory DIR[WORKING,DATA]
-    csit-vpp-perf-mrr-daily-master:
-    -
-      build: 1
-      file: "{DIR[WORKING,DATA]}/output_mrr_1.xml"
-    -
-      build: 2
-      file: "{DIR[WORKING,DATA]}/output_mrr_2.xml"
-    -
-      build: 3
-      file: "{DIR[WORKING,DATA]}/output_mrr_3.xml"
-    -
-      build: 4
-      file: "{DIR[WORKING,DATA]}/output_mrr_4.xml"
-    -
-      build: 5
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 6
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 7
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 8
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 9
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 10
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 11
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-    -
-      build: 12
-      file: "{DIR[WORKING,DATA]}/output_mrr_5.xml"
-
 -
   type: "static"
   src-path: "{DIR[RST]}"
@@ -179,15 +140,16 @@
 
 -
   type: "input"  # Ignored in debug mode
+#  general:
+#    file-name: "robot-plugin.zip"
+#    file-format: ".zip"
+#    download-path: "{job}/{build}/robot/report/*zip*/{filename}"
+#    extract: "robot-plugin/output.xml"
   general:
     file-name: "output.xml.gz"
     file-format: ".gz"
     download-path: "{job}/{build}/archives/{filename}"
     extract: "output.xml"
-#    file-name: "robot-plugin.zip"
-#    file-format: ".zip"
-#    download-path: "{job}/{build}/robot/report/*zip*/{filename}"
-#    extract: "robot-plugin/output.xml"
   builds:
     csit-vpp-perf-mrr-daily-master:
       start: 15
@@ -215,16 +177,17 @@
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c"
   data: "plot-performance-trending"
-  filter: "'1T1C'"
+  filter: "'MRR' and '1T1C'"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
+  - "result"
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
-  window: 10
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
 
 -
   type: "table"
@@ -233,16 +196,17 @@
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t2c"
   data: "plot-performance-trending"
-  filter: "'2T2C'"
+  filter: "'MRR' and '2T2C'"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
+  - "result"
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-2t2c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
-  window: 10
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
 
 -
   type: "table"
@@ -251,16 +215,38 @@
   output-file-ext: ".csv"
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c"
   data: "plot-performance-trending"
-  filter: "'4T4C'"
+  filter: "'MRR' and '4T4C'"
   parameters:
   - "name"
   - "parent"
-  - "throughput"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
+  - "result"
+  ignore-list:
+  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-4t4c-eth-l2bdscale1mmaclrn-ndrdisc"
   outlier-const: 1.5
-  window: 10
+  window: 14
+  evaluated-window: 14
+  long-trend-window: 180
+
+-
+  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"
 
 
 ################################################################################
@@ -287,8 +273,8 @@
       - "result"
       periods:
       - 1
-      - 14
-      # # - 60
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -299,7 +285,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -311,7 +297,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -323,7 +309,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -335,7 +321,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -347,7 +333,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -361,7 +347,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -373,7 +359,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -385,7 +371,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -399,7 +385,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -411,7 +397,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -423,7 +409,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -435,7 +421,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -447,7 +433,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -459,7 +445,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -468,36 +454,36 @@
     - title: "VPP 1T1C IPv4 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-1t1c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      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"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C IPv4 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-2t2c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      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"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C IPv4 64B Packet Throughput - {period} Trending"
       output-file-name: "ip4-4t4c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      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"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -509,7 +495,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -521,7 +507,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -533,7 +519,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -547,7 +533,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -559,7 +545,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -571,7 +557,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -580,36 +566,36 @@
     - 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'"
+      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"
       periods:
       - 1
-      - 14
+      # - 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'"
+      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"
       periods:
       - 1
-      - 14
+      # - 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'"
+      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"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -621,7 +607,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -633,7 +619,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -645,7 +631,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -659,7 +645,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -671,7 +657,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -683,7 +669,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -697,7 +683,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -709,7 +695,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -721,7 +707,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -735,7 +721,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -747,7 +733,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -759,7 +745,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -773,7 +759,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -785,7 +771,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -797,7 +783,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -811,7 +797,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -823,7 +809,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -835,7 +821,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -849,7 +835,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -861,7 +847,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -873,7 +859,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -887,7 +873,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -899,7 +885,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -911,7 +897,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -925,7 +911,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -937,7 +923,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -949,7 +935,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -963,7 +949,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -975,7 +961,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -987,7 +973,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1001,7 +987,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1013,7 +999,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1025,7 +1011,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1039,7 +1025,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1051,7 +1037,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1063,7 +1049,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1077,7 +1063,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1089,7 +1075,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1101,7 +1087,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1115,7 +1101,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1127,7 +1113,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1139,7 +1125,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1148,37 +1134,37 @@
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-1t1c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-2t2c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-4t4c-x520"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1187,37 +1173,37 @@
     - 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'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 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'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 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'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1226,37 +1212,37 @@
     - title: "VPP 1T1C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-1t1c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' 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 '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-2t2c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' 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 '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
     - title: "VPP 4T4C VM vhost eth 64B Packet Throughput - {period} Trending"
       output-file-name: "vm-vhost-eth-4t4c-xl710"
       data: "plot-performance-trending"
-      filter: "'NIC_Intel-XL710' 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 '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1265,37 +1251,37 @@
     - 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'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 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'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 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'"
+      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1309,7 +1295,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1321,7 +1307,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1333,7 +1319,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1347,7 +1333,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1359,7 +1345,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1371,7 +1357,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1380,37 +1366,37 @@
     - 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'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 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'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 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'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1419,37 +1405,37 @@
     - 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'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
 
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 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'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 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'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD'"
       parameters:
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1463,7 +1449,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1475,7 +1461,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1487,6 +1473,6 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"