Report: Update data sources

Change-Id: I3cec31d1db74330ef7ef8341c19f7fe1d5894b53
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 90cd968d53e450c4da3aeece28f19963e333794a)

1 files changed, 206 insertions, 144 deletions

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index fff337a8dc..ef19592431 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -143,8 +143,9 @@
     - 19
     - 21
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
     csit-dpdk-perf-1710-all:
     - 2
     - 3
@@ -159,10 +160,10 @@
     csit-ligato-perf-1710-all:
     - 1
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 62
+    - 91
     csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
     - 7
-    hc2vpp-csit-integration-1710-ubuntu1604:
+    csit-hc2vpp-verify-func-1710-ubuntu1604:
     - lastSuccessfulBuild
 #    hc2vpp-csit-perf-master-ubuntu1604:  # REMOVE???
 #    - 8
@@ -229,8 +230,9 @@
     - 19
     - 21
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "template"
   parameters:
   - "throughput"
@@ -254,7 +256,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "name"
@@ -278,7 +280,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "parent"
@@ -301,7 +303,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "parent"
@@ -327,7 +329,7 @@
   rows: "generated"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 62
+    - 91
   filter: "all"
   parameters:
   - "name"
@@ -351,7 +353,7 @@
   rows: "generated"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 62
+    - 91
   filter: "all"
   parameters:
   - "parent"
@@ -430,7 +432,7 @@
     data: "data status"
   rows: "generated"
   data:
-    hc2vpp-csit-integration-1710-ubuntu1604:
+    csit-hc2vpp-verify-func-1710-ubuntu1604:
     - "lastSuccessfulBuild"
   filter: "all"
   parameters:
@@ -480,7 +482,7 @@
   dir-tables: "{DIR[DTR,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "name"
@@ -499,7 +501,7 @@
   dir-tables: "{DIR[DTC,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "name"
@@ -518,7 +520,7 @@
   dir-tables: "{DIR[DTO,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "name"
@@ -537,7 +539,7 @@
   dir-tables: "{DIR[DTR,FUNC,VPP]}"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 62
+    - 91
   filter: "all"
   parameters:
   - "name"
@@ -556,7 +558,7 @@
   dir-tables: "{DIR[DTC,FUNC,VPP]}"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 62
+    - 91
   filter: "all"
   parameters:
   - "name"
@@ -614,7 +616,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,FUNC,HC]}"
   data:
-    hc2vpp-csit-integration-1710-ubuntu1604:
+    csit-hc2vpp-verify-func-1710-ubuntu1604:
     - "lastSuccessfulBuild"
   filter: "all"
   parameters:
@@ -662,11 +664,12 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel1-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   # Keep this formatting, the filter is enclosed with " (quotation mark) and
   # each tag is enclosed with ' (apostrophe).
-  filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -724,9 +727,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel1-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
-  filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+    - 11
+    - 12
+    - 13
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -784,9 +788,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel1-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
-  filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+    - 11
+    - 12
+    - 13
+  filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -844,9 +849,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel1-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
-  filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+    - 11
+    - 12
+    - 13
+  filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
   - "parent"
@@ -905,8 +911,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel2-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'FEATURE' and 'ACL50' and '10k_FLOWS' and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -965,8 +972,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel2-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'FEATURE' and 'ACL50' and '10k_FLOWS' and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1025,8 +1033,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel2-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'FEATURE' and 'ACL50' and '10k_FLOWS' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1085,8 +1094,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel2-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'FEATURE' and 'ACL50' and '10k_FLOWS' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1146,8 +1156,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-ip4-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1206,8 +1217,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-ip4-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1266,8 +1278,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-ip4-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1326,8 +1339,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-ip4-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1387,8 +1401,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-1t1c-ethip6-ip6-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1447,8 +1462,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-2t2c-ethip6-ip6-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1507,8 +1523,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-1t1c-ethip6-ip6-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1567,8 +1584,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-2t2c-ethip6-ip6-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1628,8 +1646,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'ENCAP' and 'NDRDISC' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
   parameters:
   - "throughput"
@@ -1688,8 +1707,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'ENCAP' and 'NDRDISC' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
   parameters:
   - "throughput"
@@ -1748,8 +1768,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'ENCAP' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
   parameters:
   - "throughput"
@@ -1808,8 +1829,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'ENCAP' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
   parameters:
   - "throughput"
@@ -1869,8 +1891,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-1t1c-ethip6-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and 'ENCAP' and 'NDRDISC' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1929,8 +1952,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-2t2c-ethip6-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and 'ENCAP' and 'NDRDISC' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1989,8 +2013,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-1t1c-ethip6-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and 'ENCAP' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -2049,8 +2074,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-2t2c-ethip6-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and 'ENCAP' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -2110,8 +2136,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-vhost-sel1-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'NDRDISC' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "throughput"
@@ -2170,8 +2197,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-vhost-sel1-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'NDRDISC' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "throughput"
@@ -2230,8 +2258,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-vhost-sel1-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "throughput"
@@ -2290,8 +2319,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-vhost-sel1-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "throughput"
@@ -2351,8 +2381,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-vhost-sel2-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'NDRDISC' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "throughput"
@@ -2411,8 +2442,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-vhost-sel2-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'NDRDISC' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "throughput"
@@ -2471,8 +2503,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-vhost-sel2-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "throughput"
@@ -2531,8 +2564,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-vhost-sel2-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "throughput"
@@ -2592,8 +2626,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ipsechw-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "throughput"
@@ -2652,8 +2687,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ipsechw-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "throughput"
@@ -2712,8 +2748,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ipsechw-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "throughput"
@@ -2772,8 +2809,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ipsechw-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "throughput"
@@ -3380,9 +3418,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel1-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
-  filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+    - 11
+    - 12
+    - 13
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -3438,9 +3477,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel1-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
-  filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+    - 11
+    - 12
+    - 13
+  filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
   - "parent"
@@ -3497,8 +3537,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel2-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and ('FEATURE' and 'ACL50' and '10k_FLOWS') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -3555,8 +3596,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel2-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and ('FEATURE' and 'ACL50' and '10k_FLOWS') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -3614,8 +3656,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-ip4-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
@@ -3672,8 +3715,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-ip4-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
@@ -3731,8 +3775,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-1t1c-ethip6-ip6-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
@@ -3789,8 +3834,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-2t2c-ethip6-ip6-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
@@ -3848,8 +3894,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ethip4-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'ENCAP' and 'NDRDISC' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
   parameters:
   - "latency"
@@ -3906,8 +3953,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ethip4-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'ENCAP' and 'NDRDISC' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
   parameters:
   - "latency"
@@ -3965,8 +4013,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-1t1c-ethip6-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and 'ENCAP' and 'NDRDISC' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "latency"
@@ -4023,8 +4072,9 @@
   output-file: "{DIR[STATIC,VPP]}/78B-2t2c-ethip6-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'78B' and 'ENCAP' and 'NDRDISC' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "latency"
@@ -4082,8 +4132,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-vhost-sel1-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'NDRDISC' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "latency"
@@ -4140,8 +4191,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-vhost-sel1-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'NDRDISC' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "latency"
@@ -4199,8 +4251,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-vhost-sel2-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'NDRDISC' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "latency"
@@ -4257,8 +4310,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-vhost-sel2-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'NDRDISC' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "latency"
@@ -4316,8 +4370,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-ipsechw-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "latency"
@@ -4374,8 +4429,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-ipsechw-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "latency"
@@ -4700,8 +4756,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-memif-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -4760,8 +4817,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-memif-ndrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -4820,8 +4878,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-memif-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -4880,8 +4939,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-memif-pdrdisc"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5180,8 +5240,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-memif-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -5238,8 +5299,9 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-memif-ndrdisc-lat50"
   data:
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"