PAL: Perf improvements - more data sources

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

3 files changed, 34 insertions, 14 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 7bb1710409..2658de1472 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
@@ -49,3 +49,11 @@ tests.vpp.perf.container memif.10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdi
 tests.vpp.perf.container memif.10ge2p1x520-eth-l2xcbase-eth-2memif-1drc-ndrpdrdisc.tc02-64b-1t1c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc,LXC MEMIF,10ge2p1x520: 64B-1t1c-eth-l2xcbase-eth-2memif-1dcr-pdrdisc,,,
 tests.vpp.perf.container memif.10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.tc01-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc,LXC MEMIF,10ge2p1x520: 64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc,,,
 tests.vpp.perf.container memif.10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.tc02-64b-1t1c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc,LXC MEMIF,10ge2p1x520: 64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc,,,
+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,,,
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 920c30a4a8..afd8390c91 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -237,16 +237,17 @@ def table_performance_improvements(table, input_data):
                     val = tmpl_item[int(args[0])]
                 tbl_item.append({"data": val})
             elif cmd == "data":
-                job = args[0]
-                operation = args[1]
+                jobs = args[0:-1]
+                operation = args[-1]
                 data_lst = list()
-                for build in data[job]:
-                    try:
-                        data_lst.append(float(build[tmpl_item[0]]["throughput"]
-                                              ["value"]))
-                    except (KeyError, TypeError):
-                        # No data, ignore
-                        continue
+                for job in jobs:
+                    for build in data[job]:
+                        try:
+                            data_lst.append(float(build[tmpl_item[0]]
+                                                  ["throughput"]["value"]))
+                        except (KeyError, TypeError):
+                            # No data, ignore
+                            continue
                 if data_lst:
                     tbl_item.append({"data": (eval(operation)(data_lst)) /
                                              1000000})
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index cc8de35825..195e19e826 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -222,10 +222,10 @@
     data: "data csit-vpp-perf-1707-all mean"
   -
     title: "17.10 mean [Mpps]"
-    data: "data csit-vpp-perf-1710-all mean"
+    data: "data csit-vpp-perf-1710-all csit-ligato-perf-1710-all mean"
   -
     title: "17.10 stdev [Mpps]"
-    data: "data csit-vpp-perf-1710-all stdev"
+    data: "data csit-vpp-perf-1710-all csit-ligato-perf-1710-all stdev"
   -
     title: "17.07 to 17.10 change [%]"
     data: "operation relative_change 5 6"
@@ -253,6 +253,17 @@
     - 18
     - 19
     - 20
+    csit-ligato-perf-1710-all:
+    - 5
+    - 7
+    - 8
+    - 9
+    - 10
+    - 11
+    - 12
+    - 13
+    - 16
+    - 17
   filter: "template"
   parameters:
   - "throughput"
@@ -513,7 +524,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2  # 0, 1, 2, ...
+  data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
 -
@@ -534,7 +545,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2  # 0, 1, 2, ...
+  data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
 -
@@ -555,7 +566,7 @@
   - "doc"
   - "level"
   - "parent"
-  data-start-level: 2  # 0, 1, 2, ...
+  data-start-level: 3  # 0, 1, 2, ...
   chapters-start-level: 2  # 0, 1, 2, ...
 
 -