From 3f2beec17f60c2c6b003c955e02451a77944197b Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Tue, 31 Oct 2017 14:00:29 +0100
Subject: Report: data

Change-Id: I1e6d9a6df9989a3730391be878b619bf02302a7e
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 resources/tools/presentation/generator_tables.py | 14 ++++++------
 resources/tools/presentation/specification.yaml  | 29 +++++++++++++++++++++++-
 resources/tools/presentation/utils.py            |  2 +-
 3 files changed, 36 insertions(+), 9 deletions(-)

(limited to 'resources/tools')

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 59059df08e..1071dee409 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -194,13 +194,13 @@ def table_performance_improvements(table, input_data):
             elif cmd == "operation":
                 operation = args[0]
                 try:
-                    nr1 = tbl_item[int(args[1])]["data"]
-                    nr2 = tbl_item[int(args[2])]["data"]
+                    nr1 = float(tbl_item[int(args[1])]["data"])
+                    nr2 = float(tbl_item[int(args[2])]["data"])
                     if nr1 and nr2:
                         tbl_item.append({"data": eval(operation)(nr1, nr2)})
                     else:
                         tbl_item.append({"data": None})
-                except IndexError:
+                except (IndexError, ValueError):
                     logging.error("No data for {0}".format(tbl_item[1]["data"]))
                     tbl_item.append({"data": None})
                     continue
@@ -228,19 +228,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:
+                        and item[-1]["data"] >= 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:
+                        and item[-1]["data"] >= 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:
+                        and item[-1]["data"] < 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:
+                        and item[-1]["data"] < 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 850edf6faa..8055bbaa8c 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -166,6 +166,9 @@
     - 13
     csit-ligato-perf-1710-all:
     - 2
+    - 3
+    - 4
+    - 5
     csit-vpp-functional-1710-ubuntu1604-virl:
     - 115
     csit-nsh_sfc-verify-func-1710-ubuntu1604-virl:
@@ -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:
@@ -391,6 +394,9 @@
   data:
     csit-ligato-perf-1710-all:
     - 2
+    - 3
+    - 4
+    - 5
   filter: "all"
   parameters:
   - "name"
@@ -589,6 +595,9 @@
   data:
     csit-ligato-perf-1710-all:
     - 2
+    - 3
+    - 4
+    - 5
   filter: "all"
   parameters:
   - "name"
@@ -5419,6 +5428,9 @@
   data:
     csit-ligato-perf-1710-all:
     - 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"
@@ -5478,6 +5490,9 @@
   data:
     csit-ligato-perf-1710-all:
     - 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"
@@ -5537,6 +5552,9 @@
   data:
     csit-ligato-perf-1710-all:
     - 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"
@@ -5596,6 +5614,9 @@
   data:
     csit-ligato-perf-1710-all:
     - 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"
@@ -5791,6 +5812,9 @@
   data:
     csit-ligato-perf-1710-all:
     - 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"
@@ -5848,6 +5872,9 @@
   data:
     csit-ligato-perf-1710-all:
     - 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"
diff --git a/resources/tools/presentation/utils.py b/resources/tools/presentation/utils.py
index f423cd22a7..f9feeb0411 100644
--- a/resources/tools/presentation/utils.py
+++ b/resources/tools/presentation/utils.py
@@ -57,7 +57,7 @@ def relative_change(nr1, nr2):
     :rtype: float
     """
 
-    return (nr1 - nr2) / nr2 * 100
+    return float((nr2 - nr1) / nr1 * 100)
 
 
 def get_files(path, extension=None, full_path=True):
-- 
cgit 1.2.3-korg