X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification_CPTA.yaml;h=535096b660921deab60910ed06396e96b08833e3;hb=372eab0eac428149d547b2d6eb2ce43cd0d750f6;hp=d4317e3f37b7a8820ff1ed2f0e527dcdd6e5f8b2;hpb=4a778c818108baf64a5abe6ffd6b27a4a88a2633;p=csit.git

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index d4317e3f37..535096b660 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:
@@ -77,6 +68,23 @@
   data-sets:
     plot-performance-trending:
       csit-vpp-perf-mrr-daily-master:
+#      - 15
+#      - 20
+#      - 25
+#      - 30
+#      - 35
+#      - 40
+#      - 45
+#      - 50
+#      - 55
+#      - 60
+#      - 65
+#      - 70
+#      - 75
+#      - 80
+#      - 85
+#      - 90
+#      - 95
         start: 15
         end: "lastCompletedBuild" # "lastSuccessfulBuild"  # take all from the 'start'
 
@@ -101,77 +109,56 @@
         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: 14
+            label: "2w"
+            step: "day"
+            stepmode: "backward"
+          - count: 1
+            label: "1m"
+            step: "month"
+            stepmode: "backward"
+          - count: 2
+            label: "2m"
+            step: "month"
+            stepmode: "backward"
+          - count: 3
+            label: "3m"
+            step: "month"
+            stepmode: "backward"
+          - step: "all"
+        # rangeslider: {}
       margin:
         r: 20
-        b: 50
-        t: 50
+        # b: 200
+        t: 5
         l: 70
       legend:
         orientation: "h"
-        traceorder: "normal"
-#        tracegroupgap: 10
-#        bordercolor: "rgb(238, 238, 238)"
-#        borderwidth: 1
+        # y: -0.5
+        xanchor: "center"
+        traceorder: "normal"  # "grouped" does not work: bug https://github.com/plotly/plotly.js/issues/1913
+        tracegroupgap: 20
+        bordercolor: "rgb(238, 238, 238)"
+        # borderwidth: 1
       hoverlabel:
         namelength: -1
 
--
-  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,17 +166,35 @@
 
 -
   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:
+#    - 15
+#    - 20
+#    - 25
+#    - 30
+#    - 35
+#    - 40
+#    - 45
+#    - 50
+#    - 55
+#    - 60
+#    - 65
+#    - 70
+#    - 75
+#    - 80
+#    - 85
+#    - 90
+#    - 95
       start: 15
       end: "lastCompletedBuild"  # take all from the 'start'
 
@@ -220,11 +225,12 @@
   - "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
+  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"
@@ -238,11 +244,12 @@
   - "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
+  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"
@@ -256,11 +263,33 @@
   - "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
+  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 +316,8 @@
       - "result"
       periods:
       - 1
-      - 14
-      # # - 60
+      # - 14
+      # - 60
       layout: "plot-cpta"
 
     - title: "VPP 2T2C L2 64B Packet Throughput - {period} Trending"
@@ -299,7 +328,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -311,7 +340,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -323,7 +352,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -335,7 +364,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -347,7 +376,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -361,7 +390,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -373,7 +402,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -385,7 +414,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -399,7 +428,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -411,7 +440,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -423,7 +452,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -435,7 +464,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -447,7 +476,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -459,7 +488,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -468,36 +497,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 +538,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -521,7 +550,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -533,7 +562,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -547,7 +576,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -559,7 +588,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -571,7 +600,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -580,36 +609,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 +650,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -633,7 +662,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -645,7 +674,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -659,7 +688,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -671,7 +700,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -683,7 +712,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -697,7 +726,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -709,7 +738,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -721,7 +750,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -735,7 +764,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -747,7 +776,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -759,7 +788,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -773,7 +802,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -785,7 +814,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -797,7 +826,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -811,7 +840,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -823,7 +852,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -835,7 +864,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -849,7 +878,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -861,7 +890,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -873,7 +902,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -887,7 +916,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -899,7 +928,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -911,7 +940,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -925,7 +954,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -937,7 +966,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -949,7 +978,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -963,7 +992,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -975,7 +1004,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -987,7 +1016,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1001,7 +1030,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1013,7 +1042,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1025,7 +1054,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1039,7 +1068,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1051,7 +1080,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1063,7 +1092,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1077,7 +1106,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1089,7 +1118,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1101,7 +1130,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1115,7 +1144,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1127,7 +1156,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1139,7 +1168,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1148,37 +1177,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 +1216,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 +1255,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 +1294,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 +1338,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1321,7 +1350,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1333,7 +1362,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1347,7 +1376,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1359,7 +1388,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1371,7 +1400,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1380,37 +1409,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 +1448,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 +1492,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1475,7 +1504,7 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"
 
@@ -1487,6 +1516,6 @@
       - "result"
       periods:
       - 1
-      - 14
+      # - 14
       # - 60
       layout: "plot-cpta"