Report: Add NFV data for existing elements

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

1 files changed, 57 insertions, 81 deletions

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 1d1f12a079..b541ee914a 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -269,11 +269,8 @@
 
     plot-vpp-nfv-2n-skx-ndrpdr:
       # TODO: Replace the data
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 22  # NFV
-        - 31  # NFV
-        - 32  # NFV
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
 
     plot-vpp-nfv-2n-skx-mrr:
       # TODO: Replace the data
@@ -609,11 +606,8 @@
         - 32  # NFV
     vpp-performance-changes-nfv-2n-skx-cmp:
       # TODO: Replace
-      # csit-vpp-perf-verify-2001-2n-skx:
-      csit-vpp-perf-verify-1908-2n-skx:
-        - 22  # NFV
-        - 31  # NFV
-        - 32  # NFV
+      csit-vpp-perf-verify-2001-2n-skx:
+        - 3  # NDRPDR sel RC2
     vpp-performance-changes-nfv-2n-skx:
       - "vpp-performance-changes-nfv-2n-skx-ref"
       - "vpp-performance-changes-nfv-2n-skx-cmp"
@@ -1967,7 +1961,7 @@
     data: "vpp-soak-vs-ndr-2n-skx-cmp"
   data: "vpp-soak-vs-ndr-2n-skx"
   include-tests: "NDR"
-  filter: "('NDRPDR' or 'SOAK')"
+  filter: "('NDRPDR' or 'SOAK') and not 'NF_DENSITY'"
   parameters:
     - "throughput"
     - "name"
@@ -1988,7 +1982,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2008,7 +2002,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2028,7 +2022,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2048,7 +2042,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2068,7 +2062,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2088,7 +2082,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2108,7 +2102,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2128,7 +2122,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2148,7 +2142,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2168,7 +2162,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2188,7 +2182,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2208,7 +2202,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2228,7 +2222,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2248,7 +2242,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-nic-comparison-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2275,7 +2269,7 @@
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR'"
+  filter: "'1T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2298,7 +2292,7 @@
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR'"
+  filter: "'2T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2321,7 +2315,7 @@
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'NDRPDR'"
+  filter: "'1T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2344,7 +2338,7 @@
     data: "vpp-performance-changes-3n-hsw-cmp"
   data: "vpp-performance-changes-3n-hsw"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'NDRPDR'"
+  filter: "'2T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2370,7 +2364,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2397,7 +2391,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2424,7 +2418,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2451,7 +2445,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-3n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2478,7 +2472,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2505,7 +2499,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2532,7 +2526,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2559,7 +2553,7 @@
     nic: "NIC_Intel-XXV710"
   data: "vpp-performance-changes-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2579,7 +2573,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-cmp"
   data: "vpp-performance-changes-nfv-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2599,7 +2593,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-cmp"
   data: "vpp-performance-changes-nfv-2n-skx"
   include-tests: "PDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2619,7 +2613,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-cmp"
   data: "vpp-performance-changes-nfv-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'NDRPDR'"
+  filter: "'2T1C' and 'NDRPDR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -2639,7 +2633,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-cmp"
   data: "vpp-performance-changes-nfv-2n-skx"
   include-tests: "NDR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'NDRPDR'"
+  filter: "'4T2C' and 'NDRPDR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3146,7 +3140,7 @@
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'1T1C' and 'MRR'"
+  filter: "'1T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3168,7 +3162,7 @@
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T2C' and 'MRR'"
+  filter: "'2T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3190,7 +3184,7 @@
     data: "vpp-performance-changes-3n-hsw-mrr-cmp"
   data: "vpp-performance-changes-3n-hsw-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T4C' and 'MRR'"
+  filter: "'4T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3212,7 +3206,7 @@
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3234,7 +3228,7 @@
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3256,7 +3250,7 @@
     data: "vpp-performance-changes-3n-skx-mrr-cmp"
   data: "vpp-performance-changes-3n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3278,7 +3272,7 @@
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3300,7 +3294,7 @@
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3322,7 +3316,7 @@
     data: "vpp-performance-changes-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and not 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3341,7 +3335,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-nfv-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'2T1C' and 'MRR'"
+  filter: "'2T1C' and 'MRR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3360,7 +3354,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-nfv-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'4T2C' and 'MRR'"
+  filter: "'4T2C' and 'MRR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -3379,7 +3373,7 @@
     data: "vpp-performance-changes-nfv-2n-skx-mrr-cmp"
   data: "vpp-performance-changes-nfv-2n-skx-mrr"
   include-tests: "MRR" # "PDR" | "NDR" | "MRR"
-  filter: "'8T4C' and 'MRR'"
+  filter: "'8T4C' and 'MRR' and 'NF_DENSITY'"
   parameters:
   - "name"
   - "parent"
@@ -6243,8 +6237,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '2T1C' and
            'MRR'"
   parameters:
@@ -6270,8 +6263,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '4T2C' and
            'MRR'"
   parameters:
@@ -6297,8 +6289,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '8T4C' and
            'MRR'"
   parameters:
@@ -6325,7 +6316,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'MRR'"
@@ -6352,7 +6342,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'MRR'"
@@ -6379,7 +6368,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'MRR'"
@@ -6407,8 +6395,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '2T1C' and
            'NDRPDR'"
   parameters:
@@ -6434,8 +6421,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '4T2C' and
            'NDRPDR'"
   parameters:
@@ -6461,8 +6447,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '8T4C' and
            'NDRPDR'"
   parameters:
@@ -6488,8 +6473,7 @@
            'NF_DENSITY' and
            'VHOST' and
            'VXLAN' and
-           'CHAIN' and
-           'NF_VPPIP4' and
+           'CHAIN' a
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
@@ -6516,7 +6500,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
@@ -6543,7 +6526,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'NDRPDR'"
@@ -6571,8 +6553,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '2T1C' and
            'NDRPDR'"
   parameters:
@@ -6598,8 +6579,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '4T2C' and
            'NDRPDR'"
   parameters:
@@ -6625,8 +6605,7 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
-           '64B' and
+           '118' and
            '8T4C' and
            'NDRPDR'"
   parameters:
@@ -6653,7 +6632,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '2T1C' and
            'NDRPDR'"
@@ -6680,7 +6658,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '4T2C' and
            'NDRPDR'"
@@ -6707,7 +6684,6 @@
            'VHOST' and
            'VXLAN' and
            'CHAIN' and
-           'NF_VPPIP4' and
            'IMIX' and
            '8T4C' and
            'NDRPDR'"