X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=ef1959243195e05c4ae0c1dd7ec02eb8fd7b05e6;hp=365847733412b5ea29d2182fc4e87cd8330b4c1c;hb=90cd968d53e450c4da3aeece28f19963e333794a;hpb=089d0c870a6d5165fa172377bc96adb0be57f2e3

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 3658477334..ef19592431 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -38,6 +38,7 @@
     DIR[DTR]: "{DIR[WORKING,SRC]}/detailed_test_results"
     DIR[DTR,PERF,DPDK]: "{DIR[DTR]}/dpdk_performance_results"
     DIR[DTR,PERF,VPP]: "{DIR[DTR]}/vpp_performance_results"
+    DIR[DTR,PERF,COT]: "{DIR[DTR]}/cot_performance_results"
     DIR[DTR,PERF,HC]: "{DIR[DTR]}/honeycomb_performance_results"
     DIR[DTR,FUNC,VPP]: "{DIR[DTR]}/vpp_functional_results"
     DIR[DTR,FUNC,HC]: "{DIR[DTR]}/honeycomb_functional_results"
@@ -142,8 +143,9 @@
     - 19
     - 21
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
     csit-dpdk-perf-1710-all:
     - 2
     - 3
@@ -155,17 +157,17 @@
     - 10
     - 11
     - 13
-#    csit-ligato-perf-1710-all:
-#    -
+    csit-ligato-perf-1710-all:
+    - 1
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 16
-    hc2vpp-csit-integration-1710-ubuntu1604:
+    - 91
+    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
+    - 7
+    csit-hc2vpp-verify-func-1710-ubuntu1604:
     - lastSuccessfulBuild
 #    hc2vpp-csit-perf-master-ubuntu1604:  # REMOVE???
 #    - 8
 #    - 9
-#    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:  # REMOVE???
-#    - 2
 
 -
   type: "output"
@@ -178,7 +180,7 @@
 ################################################################################
 ###                               T A B L E S                                ###
 ################################################################################
-
+#
 -
   type: "table"
   title: "Performance improvements"
@@ -228,8 +230,9 @@
     - 19
     - 21
     csit-vpp-perf-1710-all:
-    - 2
-    - 5
+    - 11
+    - 12
+    - 13
   filter: "template"
   parameters:
   - "throughput"
@@ -253,7 +256,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "name"
@@ -277,7 +280,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "parent"
@@ -300,7 +303,7 @@
   rows: "generated"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "parent"
@@ -326,7 +329,7 @@
   rows: "generated"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 16
+    - 91
   filter: "all"
   parameters:
   - "name"
@@ -350,13 +353,40 @@
   rows: "generated"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 16
+    - 91
   filter: "all"
   parameters:
   - "parent"
   - "name"
   - "vat-history"
 
+-
+  type: "table"
+  title: "Detailed Test Results - Container Orchestrated Topologies Performance Results"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,PERF,COT]}/cot_performance_results"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data msg"
+  rows: "generated"
+  data:
+    csit-ligato-perf-1710-all:
+    - 1
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "msg"
+
 -
   type: "table"
   title: "Detailed Test Results - DPDK Performance Results"
@@ -402,7 +432,7 @@
     data: "data status"
   rows: "generated"
   data:
-    hc2vpp-csit-integration-1710-ubuntu1604:
+    csit-hc2vpp-verify-func-1710-ubuntu1604:
     - "lastSuccessfulBuild"
   filter: "all"
   parameters:
@@ -411,32 +441,32 @@
   - "doc"
   - "status"
 
-#-
-#  type: "table"
-#  title: "Detailed Test Results - NSH SFC Functional Results"
-#  algorithm: "table_details"
-#  output-file-ext: ".csv"
-#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
-#  columns:
-#  -
-#    title: "Name"
-#    data: "data name"
-#  -
-#    title: "Documentation"
-#    data: "data doc"
-#  -
-#    title: "Status"
-#    data: "data status"
-#  rows: "generated"
-#  data:
-#    csit-nsh_sfc-verify-func-1707-ubuntu1604-virl:
-#    - 2
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "parent"
-#  - "doc"
-#  - "status"
+-
+  type: "table"
+  title: "Detailed Test Results - NSH SFC Functional Results"
+  algorithm: "table_details"
+  output-file-ext: ".csv"
+  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nsh_sfc_functional_results"
+  columns:
+  -
+    title: "Name"
+    data: "data name"
+  -
+    title: "Documentation"
+    data: "data doc"
+  -
+    title: "Status"
+    data: "data status"
+  rows: "generated"
+  data:
+    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
+    - 7
+  filter: "all"
+  parameters:
+  - "name"
+  - "parent"
+  - "doc"
+  - "status"
 
 ################################################################################
 ###                                F I L E S                                 ###
@@ -452,7 +482,7 @@
   dir-tables: "{DIR[DTR,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "name"
@@ -471,7 +501,7 @@
   dir-tables: "{DIR[DTC,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "name"
@@ -490,7 +520,7 @@
   dir-tables: "{DIR[DTO,PERF,VPP]}"
   data:
     csit-vpp-perf-1710-all:
-    - 5
+    - 13
   filter: "all"
   parameters:
   - "name"
@@ -509,7 +539,7 @@
   dir-tables: "{DIR[DTR,FUNC,VPP]}"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 16
+    - 91
   filter: "all"
   parameters:
   - "name"
@@ -528,7 +558,7 @@
   dir-tables: "{DIR[DTC,FUNC,VPP]}"
   data:
     csit-vpp-functional-1710-ubuntu1604-virl:
-    - 16
+    - 91
   filter: "all"
   parameters:
   - "name"
@@ -537,6 +567,25 @@
   data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
+-
+  type: "file"
+  title: "Container Orchestrated Performance Results"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,PERF,COT]}/cot_performance_results"
+  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,PERF,COT]}"
+  data:
+    csit-ligato-perf-1710-all:
+    - 1
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  data-start-level: 2  # 0, 1, 2, ...
+  chapters-start-level: 2  # 0, 1, 2, ...
+
 -
   type: "file"
   title: "DPDK Performance Results"
@@ -567,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:
@@ -579,26 +628,26 @@
   data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
-#-
-#  type: "file"
-#  title: "NSH SFC Functional Results"
-#  algorithm: "file_test_results"
-#  output-file-ext: ".rst"
-#  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
-#  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,NSHSFC]}"
-#  data:
-#    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
-#    - 
-#  filter: "all"
-#  parameters:
-#  - "name"
-#  - "doc"
-#  - "level"
-#  chapters:
-#  - "suites"
-#  data-start-level: 2  # 0, 1, 2, ...
-#  chapters-start-level: 2  # 0, 1, 2, ...
+-
+  type: "file"
+  title: "NSH SFC Functional Results"
+  algorithm: "file_test_results"
+  output-file-ext: ".rst"
+  output-file: "{DIR[DTR,FUNC,NSHSFC]}/nshsfc_functional_results"
+  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,NSHSFC]}"
+  data:
+    csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
+    - 7
+  filter: "all"
+  parameters:
+  - "name"
+  - "doc"
+  - "level"
+  chapters:
+  - "suites"
+  data-start-level: 2  # 0, 1, 2, ...
+  chapters-start-level: 2  # 0, 1, 2, ...
 
 ################################################################################
 ###                                P L O T S                                 ###
@@ -615,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"
@@ -677,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"
@@ -737,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"
@@ -797,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"
@@ -858,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"
@@ -918,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"
@@ -978,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"
@@ -1038,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"
@@ -1099,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"
@@ -1159,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"
@@ -1219,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"
@@ -1279,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"
@@ -1340,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"
@@ -1400,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"
@@ -1460,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"
@@ -1520,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"
@@ -1581,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"
@@ -1641,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"
@@ -1701,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"
@@ -1761,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"
@@ -1822,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"
@@ -1882,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"
@@ -1942,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"
@@ -2002,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"
@@ -2063,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"
@@ -2123,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"
@@ -2183,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"
@@ -2243,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"
@@ -2304,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"
@@ -2364,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"
@@ -2424,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"
@@ -2484,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"
@@ -2545,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"
@@ -2605,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"
@@ -2665,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"
@@ -2725,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"
@@ -3333,10 +3418,11 @@
   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'"
-  parameters:
+    - 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"
   traces:
@@ -3391,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"
@@ -3450,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"
@@ -3508,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"
@@ -3567,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"
@@ -3625,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"
@@ -3684,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"
@@ -3742,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"
@@ -3801,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"
@@ -3859,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"
@@ -3918,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"
@@ -3976,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"
@@ -4035,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"
@@ -4093,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"
@@ -4152,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"
@@ -4210,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"
@@ -4269,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"
@@ -4327,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"
@@ -4653,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"
@@ -4713,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"
@@ -4773,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"
@@ -4833,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"
@@ -4885,242 +4992,242 @@
     width: 700
     height: 1000
 
-## Container orchestrated
-#-
-#  type: "plot"
-#  title: "VPP Performance 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-ndrdisc"
-#  data:
-#    csit-ligato-perf-1710-all:
-#    -
-#  filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
-#    xaxis:
-#      autorange: True
-#      autotick: False
-#      fixedrange: False
-#      gridcolor: "rgb(238, 238, 238)"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      tickmode: "linear"
-#      title: "Indexed Test Cases"
-#      zeroline: False
-#    yaxis:
-#      gridcolor: "rgb(238, 238, 238)'"
-#      hoverformat: ".4s"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      range: []
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      title: "Packets Per Second [pps]"
-#      zeroline: False
-#    boxmode: "group"
-#    boxgroupgap: 0.5
-#    autosize: False
-#    margin:
-#      t: 50
-#      b: 20
-#      l: 50
-#      r: 20
-#    showlegend: True
-#    legend:
-#      orientation: "h"
-#    width: 700
-#    height: 1000
-#
-#-
-#  type: "plot"
-#  title: "VPP Performance 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-ndrdisc"
-#  data:
-#    csit-ligato-perf-1710-all:
-#    -
-#  filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
-#    xaxis:
-#      autorange: True
-#      autotick: False
-#      fixedrange: False
-#      gridcolor: "rgb(238, 238, 238)"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      tickmode: "linear"
-#      title: "Indexed Test Cases"
-#      zeroline: False
-#    yaxis:
-#      gridcolor: "rgb(238, 238, 238)'"
-#      hoverformat: ".4s"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      range: []
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      title: "Packets Per Second [pps]"
-#      zeroline: False
-#    boxmode: "group"
-#    boxgroupgap: 0.5
-#    autosize: False
-#    margin:
-#      t: 50
-#      b: 20
-#      l: 50
-#      r: 20
-#    showlegend: True
-#    legend:
-#      orientation: "h"
-#    width: 700
-#    height: 1000
-#
-#-
-#  type: "plot"
-#  title: "VPP Performance 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-pdrdisc"
-#  data:
-#    csit-ligato-perf-1710-all:
-#    -
-#  filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
-#    xaxis:
-#      autorange: True
-#      autotick: False
-#      fixedrange: False
-#      gridcolor: "rgb(238, 238, 238)"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      tickmode: "linear"
-#      title: "Indexed Test Cases"
-#      zeroline: False
-#    yaxis:
-#      gridcolor: "rgb(238, 238, 238)'"
-#      hoverformat: ".4s"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      range: []
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      title: "Packets Per Second [pps]"
-#      zeroline: False
-#    boxmode: "group"
-#    boxgroupgap: 0.5
-#    autosize: False
-#    margin:
-#      t: 50
-#      b: 20
-#      l: 50
-#      r: 20
-#    showlegend: True
-#    legend:
-#      orientation: "h"
-#    width: 700
-#    height: 1000
-#
-#-
-#  type: "plot"
-#  title: "VPP Performance 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
-#  algorithm: "plot_performance_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-pdrdisc"
-#  data:
-#    csit-ligato-perf-1710-all:
-#    -
-#  filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-#  parameters:
-#  - "throughput"
-#  - "parent"
-#  traces:
-#    hoverinfo: "x+y"
-#    boxpoints: "outliers"
-#    whiskerwidth: 0
-#  layout:
-#    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
-#    xaxis:
-#      autorange: True
-#      autotick: False
-#      fixedrange: False
-#      gridcolor: "rgb(238, 238, 238)"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      tickmode: "linear"
-#      title: "Indexed Test Cases"
-#      zeroline: False
-#    yaxis:
-#      gridcolor: "rgb(238, 238, 238)'"
-#      hoverformat: ".4s"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      range: []
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      title: "Packets Per Second [pps]"
-#      zeroline: False
-#    boxmode: "group"
-#    boxgroupgap: 0.5
-#    autosize: False
-#    margin:
-#      t: 50
-#      b: 20
-#      l: 50
-#      r: 20
-#    showlegend: True
-#    legend:
-#      orientation: "h"
-#    width: 700
-#    height: 1000
+# Container orchestrated
+-
+  type: "plot"
+  title: "VPP Performance 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-ndrdisc"
+  data:
+    csit-ligato-perf-1710-all:
+    - 1
+  filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ".4s"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: []
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Packets Per Second [pps]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000
+
+-
+  type: "plot"
+  title: "VPP Performance 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-ndrdisc"
+  data:
+    csit-ligato-perf-1710-all:
+    - 1
+  filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ".4s"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: []
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Packets Per Second [pps]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000
+
+-
+  type: "plot"
+  title: "VPP Performance 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-pdrdisc"
+  data:
+    csit-ligato-perf-1710-all:
+    - 1
+  filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ".4s"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: []
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Packets Per Second [pps]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000
+
+-
+  type: "plot"
+  title: "VPP Performance 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+  algorithm: "plot_performance_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-pdrdisc"
+  data:
+    csit-ligato-perf-1710-all:
+    - 1
+  filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  parameters:
+  - "throughput"
+  - "parent"
+  traces:
+    hoverinfo: "x+y"
+    boxpoints: "outliers"
+    whiskerwidth: 0
+  layout:
+    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-pdrdisc"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ".4s"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: []
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Packets Per Second [pps]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000
 
 # Ligato - Latency
 
@@ -5133,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"
@@ -5191,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"
@@ -5241,117 +5350,117 @@
     width: 700
     height: 1000
 
-## Container orchestrated
-#-
-#  type: "plot"
-#  title: "VPP Latency 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
-#  algorithm: "plot_latency_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-ndrdisc-lat50"
-#  data:
-#    csit-ligato-perf-1710-all:
-#    -
-#  filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  traces:
-#    boxmean: False
-#  layout:
-#    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
-#    xaxis:
-#      autorange: True
-#      autotick: False
-#      fixedrange: False
-#      gridcolor: "rgb(238, 238, 238)"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      tickmode: "linear"
-#      title: "Indexed Test Cases"
-#      zeroline: False
-#    yaxis:
-#      gridcolor: "rgb(238, 238, 238)'"
-#      hoverformat: ""
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      range: []
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      title: "Latency min/avg/max [uSec]"
-#      zeroline: False
-#    boxmode: "group"
-#    boxgroupgap: 0.5
-#    autosize: False
-#    margin:
-#      t: 50
-#      b: 20
-#      l: 50
-#      r: 20
-#    showlegend: True
-#    legend:
-#      orientation: "h"
-#    width: 700
-#    height: 1000
-#
-#-
-#  type: "plot"
-#  title: "VPP Latency 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
-#  algorithm: "plot_latency_box"
-#  output-file-type: ".html"
-#  output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-ndrdisc-lat50"
-#  data:
-#    csit-ligato-perf-1710-all:
-#    -
-#  filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
-#  parameters:
-#  - "latency"
-#  - "parent"
-#  traces:
-#    boxmean: False
-#  layout:
-#    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
-#    xaxis:
-#      autorange: True
-#      autotick: False
-#      fixedrange: False
-#      gridcolor: "rgb(238, 238, 238)"
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      tickmode: "linear"
-#      title: "Indexed Test Cases"
-#      zeroline: False
-#    yaxis:
-#      gridcolor: "rgb(238, 238, 238)'"
-#      hoverformat: ""
-#      linecolor: "rgb(238, 238, 238)"
-#      linewidth: 1
-#      range: []
-#      showgrid: True
-#      showline: True
-#      showticklabels: True
-#      tickcolor: "rgb(238, 238, 238)"
-#      title: "Latency min/avg/max [uSec]"
-#      zeroline: False
-#    boxmode: "group"
-#    boxgroupgap: 0.5
-#    autosize: False
-#    margin:
-#      t: 50
-#      b: 20
-#      l: 50
-#      r: 20
-#    showlegend: True
-#    legend:
-#      orientation: "h"
-#    width: 700
-#    height: 1000
+# Container orchestrated
+-
+  type: "plot"
+  title: "VPP Latency 64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+  algorithm: "plot_latency_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/64B-1t1c-container-orchestrated-ndrdisc-lat50"
+  data:
+    csit-ligato-perf-1710-all:
+    - 1
+  filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  traces:
+    boxmean: False
+  layout:
+    title: "64B-1t1c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ""
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: []
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Latency min/avg/max [uSec]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000
+
+-
+  type: "plot"
+  title: "VPP Latency 64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+  algorithm: "plot_latency_box"
+  output-file-type: ".html"
+  output-file: "{DIR[STATIC,VPP]}/64B-2t2c-container-orchestrated-ndrdisc-lat50"
+  data:
+    csit-ligato-perf-1710-all:
+    - 1
+  filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+  parameters:
+  - "latency"
+  - "parent"
+  traces:
+    boxmean: False
+  layout:
+    title: "64B-2t2c-(eth|dot1q|dot1ad)-(l2xcbase|l2bdbasemaclrn)-memif-ndrdisc"
+    xaxis:
+      autorange: True
+      autotick: False
+      fixedrange: False
+      gridcolor: "rgb(238, 238, 238)"
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      tickmode: "linear"
+      title: "Indexed Test Cases"
+      zeroline: False
+    yaxis:
+      gridcolor: "rgb(238, 238, 238)'"
+      hoverformat: ""
+      linecolor: "rgb(238, 238, 238)"
+      linewidth: 1
+      range: []
+      showgrid: True
+      showline: True
+      showticklabels: True
+      tickcolor: "rgb(238, 238, 238)"
+      title: "Latency min/avg/max [uSec]"
+      zeroline: False
+    boxmode: "group"
+    boxgroupgap: 0.5
+    autosize: False
+    margin:
+      t: 50
+      b: 20
+      l: 50
+      r: 20
+    showlegend: True
+    legend:
+      orientation: "h"
+    width: 700
+    height: 1000