CSIT-1041: Trending dashboard

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

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index db79396..96930cd 100644 (file)
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -846,7 +846,8 @@ def table_performance_trending_dashboard(table, input_data):
         for nrp in range(table["window"], -1, -1):
             tbl_pro = [item for item in tbl_reg if item[5] == nrp]
             for nro in range(table["window"], -1, -1):
-                tbl_out = [item for item in tbl_pro if item[5] == nro]
+                tbl_out = [item for item in tbl_pro if item[6] == nro]
+                tbl_out.sort(key=lambda rel: rel[2])
                 tbl_sorted.extend(tbl_out)
 
     file_name = "{0}{1}".format(table["output-file"], table["output-file-ext"])

diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index ad195d6..268b356 100644 (file)
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -222,14 +222,10 @@
   - "name"
   - "parent"
   - "result"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
   outlier-const: 1.5
   window: 14
   evaluated-window: 14
   long-trend-window: 180
-  long-trend-threshold: 80  # Percent of the highest moving median value
 
 -
   type: "table"
@@ -243,14 +239,10 @@
   - "name"
   - "parent"
   - "result"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
   outlier-const: 1.5
   window: 14
   evaluated-window: 14
   long-trend-window: 180
-  long-trend-threshold: 80  # Percent of the highest moving median value
 
 -
   type: "table"
@@ -264,14 +256,10 @@
   - "name"
   - "parent"
   - "result"
-  # Number of the best and the worst tests presented in the table. Use 0 (zero)
-  # to present all tests.
-  nr-of-tests-shown: 20
   outlier-const: 1.5
   window: 14
   evaluated-window: 14
   long-trend-window: 180
-  long-trend-threshold: 80  # Percent of the highest moving median value
 
 -
   type: "table"