CSIT-1270: Split feature tests in trending

Change-Id: Iecc841737552fea07b7fcf297c478479f7872ae7
Signed-off-by: Tibor Frank <tifrank@cisco.com>

2 files changed, 194 insertions, 34 deletions

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 99069ea630..1bbe8e38d4 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -555,9 +555,15 @@ def _generate_url(base, testbed, test_name):
     elif "vhost" in test_name:
         if "l2xcbase" in test_name or "l2bdbasemaclrn" in test_name:
             file_name = "vm_vhost_l2"
+            if "l2xcbase" in test_name:
+                feature = "-base-l2xc"
+            elif "l2bdbasemaclrn" in test_name:
+                feature = "-base-l2bd"
+            else:
+                feature = "-base"
         elif "ip4base" in test_name:
             file_name = "vm_vhost_ip4"
-        feature = "-base"
+            feature = "-base"
 
     elif "ipsec" in test_name:
         file_name = "ipsec"
@@ -571,7 +577,11 @@ def _generate_url(base, testbed, test_name):
         file_name = "ip4"
         if "xl710" in test_name:
             feature = "-base-scale-features"
-        elif "acl" in test_name or "snat" in test_name or "cop" in test_name:
+        elif "iacl" in test_name:
+            feature = "-features-iacl"
+        elif "oacl" in test_name:
+            feature = "-features-oacl"
+        elif "snat" in test_name or "cop" in test_name:
             feature = "-features"
         else:
             feature = "-base-scale"
@@ -584,8 +594,12 @@ def _generate_url(base, testbed, test_name):
             or "l2bdbasemaclrn" in test_name or "l2bdscale" in test_name \
             or "l2dbbasemaclrn" in test_name or "l2dbscale" in test_name:
         file_name = "l2"
-        if "acl" in test_name:
-            feature = "-features"
+        if "macip" in test_name:
+            feature = "-features-macip"
+        elif "iacl" in test_name:
+            feature = "-features-iacl"
+        elif "oacl" in test_name:
+            feature = "-features-oacl"
         else:
             feature = "-base-scale"
 
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index aa8528ceb4..7bb7312b11 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -635,26 +635,74 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-1t1c-x520-3n-hsw"
+    - title: "VPP 1T1C L2 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-2t2c-x520-3n-hsw"
+    - title: "VPP 2T2C L2 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
-      output-file-name: "l2-feature-4t4c-x520-3n-hsw"
+    - title: "VPP 4T4C L2 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-4t4c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C L2 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-4t4c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C L2 64B MACIP MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-1t1c-x520-3n-hsw-macip"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C L2 64B MACIP MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-2t2c-x520-3n-hsw-macip"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C L2 64B MACIP MRR Trending 3n-hsw"
+      output-file-name: "l2-feature-4t4c-x520-3n-hsw-macip"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -761,10 +809,58 @@
       - "result"
       layout: "plot-cpta"
 
+    - title: "VPP 1T1C IPv4 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-1t1c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-2t2c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 64B IACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-4t4c-x520-3n-hsw-iacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C IPv4 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-1t1c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C IPv4 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-2t2c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C IPv4 64B OACL MRR Trending 3n-hsw"
+      output-file-name: "ip4-feature-4t4c-x520-3n-hsw-oacl"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and not 'IPSEC' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
     - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -772,7 +868,7 @@
     - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -780,7 +876,7 @@
     - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'OACL' and not 'IACL' and not 'IPSEC' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -1201,54 +1297,104 @@
 
 # VM vhost - x520, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw"
+    - title: "VPP 1T1C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw"
+    - title: "VPP 2T2C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw"
+    - title: "VPP 4T4C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2xc"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2bd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2bd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw"
+    - title: "VPP 1T1C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw"
+    - title: "VPP 2T2C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw"
+    - title: "VPP 4T4C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 1T1C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 2T2C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "VPP 4T4C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+      output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
       parameters:
       - "result"
       layout: "plot-cpta"