X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=bffdabd3e8c5ce3b9cd4ce6ab1796316b1dc1e57;hb=cc9febdb8521eb12c3a535b34804664da1dd779e;hp=cdeba2ee951dbf97a147488cd8a41fce88445c8a;hpb=da97a9f4850616b2e48ddbe7a258649b2ded0aa8;p=csit.git

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index cdeba2ee95..bffdabd3e8 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -150,6 +150,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
     csit-dpdk-perf-1710-all:
     - 2
     - 3
@@ -162,16 +165,16 @@
     - 11
     - 13
     csit-ligato-perf-1710-all:
-    - 1
+    - 2
+    - 3
+    - 4
+    - 5
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 102
+    - 115
     csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
     - 7
     csit-hc2vpp-verify-func-1710-ubuntu1604:
     - lastSuccessfulBuild
-#    hc2vpp-csit-perf-master-ubuntu1604:  # REMOVE???
-#    - 8
-#    - 9
 
 -
   type: "output"
@@ -184,7 +187,7 @@
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
-#
+
 -
   type: "table"
   title: "Performance improvements"
@@ -219,7 +222,7 @@
     data: "data csit-vpp-perf-1710-all stdev"
   -
     title: "17.07 to 17.10 change [%]"
-    data: "operation relative_change 6 5"
+    data: "operation relative_change 5 6"
   rows: "generated"
   data:
     csit-vpp-perf-1707-all:
@@ -241,6 +244,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "template"
   parameters:
   - "throughput"
@@ -264,7 +270,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 15
+    - 19
   filter: "all"
   parameters:
   - "name"
@@ -288,7 +294,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 15
+    - 19
   filter: "all"
   parameters:
   - "parent"
@@ -311,7 +317,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 15
+    - 19
   filter: "all"
   parameters:
   - "parent"
@@ -337,7 +343,7 @@
   rows: "generated"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 102
+    - 115
   filter: "all"
   parameters:
   - "name"
@@ -361,7 +367,7 @@
   rows: "generated"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 102
+    - 115
   filter: "all"
   parameters:
   - "parent"
@@ -387,7 +393,7 @@
   rows: "generated"
   data:
     csit-ligato-perf-1710-all:
-    - 1
+    - 5
   filter: "all"
   parameters:
   - "name"
@@ -490,7 +496,7 @@
   dir-tables: "{DIR[DTR,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 13
+    - 19
   filter: "all"
   parameters:
   - "name"
@@ -509,7 +515,7 @@
   dir-tables: "{DIR[DTC,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 15
+    - 19
   filter: "all"
   parameters:
   - "name"
@@ -528,7 +534,7 @@
   dir-tables: "{DIR[DTO,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 15
+    - 19
   filter: "all"
   parameters:
   - "name"
@@ -547,7 +553,7 @@
   dir-tables: "{DIR[DTR,FUNC,VPP]}"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 102
+    - 115
   filter: "all"
   parameters:
   - "name"
@@ -566,7 +572,7 @@
   dir-tables: "{DIR[DTC,FUNC,VPP]}"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 102
+    - 115
   filter: "all"
   parameters:
   - "name"
@@ -585,7 +591,7 @@
   dir-tables: "{DIR[DTR,PERF,COT]}"
   data:
     csit-ligato-perf-1710-all:
-    - 1
+    - 5
   filter: "all"
   parameters:
   - "name"
@@ -679,6 +685,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   # Keep this formatting, the filter is enclosed with " (quotation mark) and
   # each tag is enclosed with ' (apostrophe).
   filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
@@ -746,6 +755,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -811,6 +823,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -876,6 +891,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE') and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -929,7 +947,7 @@
 # VPP L2 sel2
 -
   type: "plot"
-  title: "VPP Performance 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-acl-ndrdisc"
+  title: "VPP Performance 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel2-ndrdisc"
@@ -942,6 +960,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -951,7 +972,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-acl-ndrdisc"
+    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc"
     xaxis:
       autorange: True
       autotick: False
@@ -994,7 +1015,7 @@
 
 -
   type: "plot"
-  title: "VPP Performance 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-acl-ndrdisc"
+  title: "VPP Performance 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel2-ndrdisc"
@@ -1007,6 +1028,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1016,7 +1040,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-acl-ndrdisc"
+    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-ndrdisc"
     xaxis:
       autorange: True
       autotick: False
@@ -1059,7 +1083,7 @@
 
 -
   type: "plot"
-  title: "VPP Performance 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-acl-pdrdisc"
+  title: "VPP Performance 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-pdrdisc"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-l2-sel2-pdrdisc"
@@ -1072,6 +1096,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1081,7 +1108,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-acl-pdrdisc"
+    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-pdrdisc"
     xaxis:
       autorange: True
       autotick: False
@@ -1124,7 +1151,7 @@
 
 -
   type: "plot"
-  title: "VPP Performance 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-acl-pdrdisc"
+  title: "VPP Performance 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-pdrdisc"
   algorithm: "plot_performance_box"
   output-file-type: ".html"
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-l2-sel2-pdrdisc"
@@ -1137,6 +1164,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'FEATURE' and ('ACL10' or 'ACL50') and '10k_FLOWS' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1146,7 +1176,7 @@
     boxpoints: "outliers"
     whiskerwidth: 0
   layout:
-    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-acl-pdrdisc"
+    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-pdrdisc"
     xaxis:
       autorange: True
       autotick: False
@@ -1203,6 +1233,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1268,6 +1301,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1333,6 +1369,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -1398,6 +1437,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -1464,6 +1506,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1529,6 +1574,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "throughput"
@@ -1594,6 +1642,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -1659,6 +1710,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -1725,6 +1779,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -1790,6 +1847,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -1855,6 +1915,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -1920,6 +1983,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -1986,6 +2052,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'78B' and 'ENCAP' and 'NDRDISC' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -2051,6 +2120,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'78B' and 'ENCAP' and 'NDRDISC' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -2116,6 +2188,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -2181,6 +2256,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -2247,6 +2325,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'NDRDISC' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "throughput"
@@ -2312,6 +2393,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'NDRDISC' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "throughput"
@@ -2377,6 +2461,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "throughput"
@@ -2442,6 +2529,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "throughput"
@@ -2508,6 +2598,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'NDRDISC' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "throughput"
@@ -2573,6 +2666,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'NDRDISC' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "throughput"
@@ -2638,6 +2734,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -2703,6 +2802,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -2769,6 +2871,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "throughput"
@@ -2834,6 +2939,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "throughput"
@@ -2899,6 +3007,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "throughput"
@@ -2964,6 +3075,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "throughput"
@@ -3577,6 +3691,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -3640,6 +3757,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -3704,6 +3824,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('FEATURE' and 'ACL50' and '10k_FLOWS') and 'NDRDISC' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -3767,6 +3890,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('FEATURE' and 'ACL50' and '10k_FLOWS') and 'NDRDISC' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -3831,6 +3957,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
@@ -3894,6 +4023,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
@@ -3958,6 +4090,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
@@ -4021,6 +4156,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'78B' and ('BASE' or 'SCALE' or 'FEATURE') and 'NDRDISC' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
   parameters:
   - "latency"
@@ -4085,6 +4223,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -4148,6 +4289,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   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"
@@ -4212,6 +4356,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'78B' and 'ENCAP' and 'NDRDISC' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "latency"
@@ -4275,6 +4422,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'78B' and 'ENCAP' and 'NDRDISC' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST'"
   parameters:
   - "latency"
@@ -4339,6 +4489,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'NDRDISC' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "latency"
@@ -4402,6 +4555,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'NDRDISC' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD')"
   parameters:
   - "latency"
@@ -4466,6 +4622,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'NDRDISC' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "latency"
@@ -4529,6 +4688,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'NDRDISC' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'DOT1Q' and not '2VM'"
   parameters:
   - "latency"
@@ -4593,6 +4755,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "latency"
@@ -4656,6 +4821,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and not 'VHOST' and 'IP4FWD' and 'NDRDISC' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN')"
   parameters:
   - "latency"
@@ -4987,6 +5155,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5052,6 +5223,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5117,6 +5291,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5182,6 +5359,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5241,7 +5421,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-ndrdisc"
   data:
     csit-ligato-perf-1710-all:
-    - 1
+    - 2
+    - 3
+    - 4
+    - 5
   filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5300,7 +5483,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-ndrdisc"
   data:
     csit-ligato-perf-1710-all:
-    - 1
+    - 2
+    - 3
+    - 4
+    - 5
   filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5359,7 +5545,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-pdrdisc"
   data:
     csit-ligato-perf-1710-all:
-    - 1
+    - 2
+    - 3
+    - 4
+    - 5
   filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5418,7 +5607,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-pdrdisc"
   data:
     csit-ligato-perf-1710-all:
-    - 1
+    - 2
+    - 3
+    - 4
+    - 5
   filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5487,6 +5679,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -5550,6 +5745,9 @@
     - 15
     - 16
     - 17
+    - 18
+    - 19
+    - 20
   filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -5607,7 +5805,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-ndrdisc-lat50"
   data:
     csit-ligato-perf-1710-all:
-    - 1
+    - 2
+    - 3
+    - 4
+    - 5
   filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -5664,7 +5865,10 @@
   output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-ndrdisc-lat50"
   data:
     csit-ligato-perf-1710-all:
-    - 1
+    - 2
+    - 3
+    - 4
+    - 5
   filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"