Report: data

Change-Id: I182250716776f31328e4c33e53166a19b6f9ce73
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 0d53d645a6d78b581e7ad1e257af4f943a52f465)

3 files changed, 18 insertions, 12 deletions

diff --git a/docs/report/vpp_performance_tests/performance_improvements/tmpl_performance_improvements.csv b/docs/report/vpp_performance_tests/performance_improvements/tmpl_performance_improvements.csv
index 947d86229a..7bb1710409 100644
--- a/docs/report/vpp_performance_tests/performance_improvements/tmpl_performance_improvements.csv
+++ b/docs/report/vpp_performance_tests/performance_improvements/tmpl_performance_improvements.csv
@@ -43,14 +43,6 @@ tests.vpp.perf.ip6.10ge2p1x520-ethip6-ip6base-ndrpdrdisc.tc02-78b-1t1c-ethip6-ip
 tests.vpp.perf.ip6.10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.tc02-78b-1t1c-ethip6-ip6base-copwhtlistbase-pdrdisc,IPv6 COP,10ge2p1x520: 78B-1t1c-ethip6-ip6base-copwhtlistbase-pdrdisc,6.1,6.1,6.9
 tests.vpp.perf.ip6.10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.tc02-78b-1t1c-ethip6-ip6base-iacldstbase-pdrdisc,IPv6 iAcl,10ge2p1x520: 78B-1t1c-ethip6-ip6base-iacldstbase-pdrdisc,6.5,6.1,6.9
 tests.vpp.perf.ip6.10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.tc02-78b-1t1c-ethip6-ip6scale2m-pdrdisc,IPv6 FIB 2M,10ge2p1x520: 78B-1t1c-ethip6-ip6scale2m-pdrdisc,5.3,4.2,4.6
-tests.kubernetes.perf.container memif.10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.tc01-64b-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc,K8S MEMIF,10ge2p1x520: 64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrdisc,,,
-tests.kubernetes.perf.container memif.10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.tc02-64b-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc,K8S MEMIF,10ge2p1x520: 64B-1t1c-eth-1drcl2bdbasemaclrn-eth-2memif-1drcl2xc-k8s-pdrdisc,,,
-tests.kubernetes.perf.container memif.10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.tc01-64b-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc,K8S MEMIF,10ge2p1x520: 64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrdisc,,,
-tests.kubernetes.perf.container memif.10ge2p1x520-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.tc02-64b-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc,K8S MEMIF,10ge2p1x520: 64B-1t1c-eth-1drcl2bdbasemaclrn-eth-4memif-2drcl2xc-k8s-pdrdisc,,,
-tests.kubernetes.perf.container memif.10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.tc01-64b-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc,K8S MEMIF,10ge2p1x520: 64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrdisc,,,
-tests.kubernetes.perf.container memif.10ge2p1x520-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-ndrpdrdisc.tc02-64b-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc,K8S MEMIF,10ge2p1x520: 64B-1t1c-eth-1drcl2xcbase-eth-2memif-1drcl2xc-k8s-pdrdisc,,,
-tests.kubernetes.perf.container memif.10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.tc01-64b-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc,K8S MEMIF,10ge2p1x520: 64B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrdisc,,,
-tests.kubernetes.perf.container memif.10ge2p1x520-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-ndrpdrdisc.tc02-64b-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc,K8S MEMIF,10ge2p1x520: 64B-1t1c-eth-1drcl2xcbase-eth-4memif-2drcl2xc-k8s-pdrdisc,,,
 tests.vpp.perf.container memif.10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.tc01-64b-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrdisc,LXC MEMIF,10ge2p1x520: 64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrdisc,,,
 tests.vpp.perf.container memif.10ge2p1x520-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdrdisc.tc02-64b-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-pdrdisc,LXC MEMIF,10ge2p1x520: 64B-1t1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-pdrdisc,,,
 tests.vpp.perf.container memif.10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.tc01-64b-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc,LXC MEMIF,10ge2p1x520: 64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-ndrdisc,,,
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index e66047f9bc..379205cbea 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -229,19 +229,19 @@ def table_performance_improvements(table, input_data):
             for item in tbl_lst:
                 if "ndr_top" in file_name \
                         and "ndr" in item[1]["data"] \
-                        and item[-1]["data"] >= 10.0:
+                        and round(item[-1]["data"], 1) >= 10.0:
                     _write_line_to_file(file_handler, item)
                 elif "pdr_top" in file_name \
                         and "pdr" in item[1]["data"] \
-                        and item[-1]["data"] >= 10.0:
+                        and round(item[-1]["data"], 1) >= 10.0:
                     _write_line_to_file(file_handler, item)
                 elif "ndr_low" in file_name \
                         and "ndr" in item[1]["data"] \
-                        and item[-1]["data"] < 10.0:
+                        and round(item[-1]["data"], 1) < 10.0:
                     _write_line_to_file(file_handler, item)
                 elif "pdr_low" in file_name \
                         and "pdr" in item[1]["data"] \
-                        and item[-1]["data"] < 10.0:
+                        and round(item[-1]["data"], 1) < 10.0:
                     _write_line_to_file(file_handler, item)
 
     logging.info("  Done.")
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index bffdabd3e8..c3f5a59d4a 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -169,6 +169,8 @@
     - 3
     - 4
     - 5
+    - 6
+    - 7
     csit-vpp-functional-1710-ubuntu1604-virl:
     - 115
     csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
@@ -5425,6 +5427,8 @@
     - 3
     - 4
     - 5
+    - 6
+    - 7
   filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5487,6 +5491,8 @@
     - 3
     - 4
     - 5
+    - 6
+    - 7
   filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5549,6 +5555,8 @@
     - 3
     - 4
     - 5
+    - 6
+    - 7
   filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5611,6 +5619,8 @@
     - 3
     - 4
     - 5
+    - 6
+    - 7
   filter: "'64B' and 'BASE' and 'PDRDISC' and not 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "throughput"
@@ -5809,6 +5819,8 @@
     - 3
     - 4
     - 5
+    - 6
+    - 7
   filter: "'64B' and 'BASE' and 'NDRDISC' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"
@@ -5869,6 +5881,8 @@
     - 3
     - 4
     - 5
+    - 6
+    - 7
   filter: "'64B' and 'BASE' and 'NDRDISC' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
   parameters:
   - "latency"