X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_CPTA.py;h=69c52d4180f2ae3fe17c8a307ef0f1602b76a056;hp=09d2e444aebc413656b17a9f2dbdf9c2b0de2475;hb=c623ad8042127fcb4bbd3c9ffb646f40371b7510;hpb=a09211590e3de1cb45c1ad1e0aae6fd84bf15c14

diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 09d2e444ae..69c52d4180 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -16,6 +16,8 @@
 
 import datetime
 import logging
+import csv
+import prettytable
 import plotly.offline as ploff
 import plotly.graph_objs as plgo
 import plotly.exceptions as plerr
@@ -289,19 +291,21 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
             "color": anomalies_res,
             "colorscale": color_scale,
             "showscale": True,
-
+            "line": {
+                "width": 2
+            },
             "colorbar": {
                 "y": 0.5,
                 "len": 0.8,
-                "title": "Results Clasification",
+                "title": "Circles Marking Data Classification",
                 "titleside": 'right',
                 "titlefont": {
                     "size": 14
                 },
                 "tickmode": 'array',
                 "tickvals": [0.125, 0.375, 0.625, 0.875],
-                "ticktext": ["Outlier", "Regress", "Normal", "Progress"],
-                "ticks": 'outside',
+                "ticktext": ["Outlier", "Regression", "Normal", "Progression"],
+                "ticks": "",
                 "ticklen": 0,
                 "tickangle": -90,
                 "thickness": 10
@@ -312,7 +316,7 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
 
     if show_moving_median:
         data_mean_y = pd.Series(data_y).rolling(
-            window=moving_win_size).median()
+            window=moving_win_size, min_periods=2).median()
         trace_median = plgo.Scatter(
             x=data_x,
             y=data_mean_y,
@@ -322,7 +326,7 @@ def _generate_trending_traces(in_data, period, moving_win_size=10,
                 "width": 1,
                 "color": color,
             },
-            name='{name}-trend'.format(name=name, size=moving_win_size)
+            name='{name}-trend'.format(name=name)
         )
         traces.append(trace_median)
 
@@ -358,6 +362,13 @@ def _generate_all_charts(spec, input_data):
     :type input_data: InputData
     """
 
+    csv_table = list()
+    # Create the header:
+    builds = spec.cpta["data"].values()[0]
+    builds_lst = [str(build) for build in range(builds[0], builds[-1] + 1)]
+    header = "Build Number:," + ",".join(builds_lst) + '\n'
+    csv_table.append(header)
+
     results = list()
     for chart in spec.cpta["plots"]:
         logging.info("  Generating the chart '{0}' ...".
@@ -372,14 +383,22 @@ def _generate_all_charts(spec, input_data):
         chart_data = dict()
         for job in data:
             for idx, build in job.items():
-                for test in build:
-                    if chart_data.get(test["name"], None) is None:
-                        chart_data[test["name"]] = OrderedDict()
+                for test_name, test in build.items():
+                    if chart_data.get(test_name, None) is None:
+                        chart_data[test_name] = OrderedDict()
                     try:
-                        chart_data[test["name"]][int(idx)] = \
+                        chart_data[test_name][int(idx)] = \
                             test["result"]["throughput"]
                     except (KeyError, TypeError):
-                        chart_data[test["name"]][int(idx)] = None
+                        pass
+
+        # Add items to the csv table:
+        for tst_name, tst_data in chart_data.items():
+            tst_lst = list()
+            for build in builds_lst:
+                item = tst_data.get(int(build), '')
+                tst_lst.append(str(item) if item else '')
+            csv_table.append("{0},".format(tst_name) + ",".join(tst_lst) + '\n')
 
         for period in chart["periods"]:
             # Generate traces:
@@ -391,6 +410,7 @@ def _generate_all_charts(spec, input_data):
                     logging.warning("No data for the test '{0}'".
                                     format(test_name))
                     continue
+                test_name = test_name.split('.')[-1]
                 trace, result = _generate_trending_traces(
                     test_data,
                     period=period,
@@ -404,9 +424,6 @@ def _generate_all_charts(spec, input_data):
                 idx += 1
 
             # Generate the chart:
-            period_name = "Daily" if period == 1 else \
-                "Weekly" if period < 20 else "Monthly"
-            chart["layout"]["title"] = chart["title"].format(period=period_name)
             _generate_chart(traces,
                             chart["layout"],
                             file_name="{0}-{1}-{2}{3}".format(
@@ -417,6 +434,32 @@ def _generate_all_charts(spec, input_data):
 
         logging.info("  Done.")
 
+    # Write the tables:
+    file_name = spec.cpta["output-file"] + "-trending"
+    with open("{0}.csv".format(file_name), 'w') as file_handler:
+        file_handler.writelines(csv_table)
+
+    txt_table = None
+    with open("{0}.csv".format(file_name), 'rb') as csv_file:
+        csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
+        header = True
+        for row in csv_content:
+            if txt_table is None:
+                txt_table = prettytable.PrettyTable(row)
+                header = False
+            else:
+                if not header:
+                    for idx, item in enumerate(row):
+                        try:
+                            row[idx] = str(round(float(item) / 1000000, 2))
+                        except ValueError:
+                            pass
+                txt_table.add_row(row)
+        txt_table.align["Build Number:"] = "l"
+    with open("{0}.txt".format(file_name), "w") as txt_file:
+        txt_file.write(str(txt_table))
+
+    # Evaluate result:
     result = "PASS"
     for item in results:
         if item is None:
@@ -426,9 +469,8 @@ def _generate_all_charts(spec, input_data):
             result = "PASS"
         elif item == 0.33 or item == 0.0:
             result = "FAIL"
-    print(results)
-    print(result)
-    if result == "FAIL":
-        return 1
-    else:
-        return 0
+
+    logging.info("Partial results: {0}".format(results))
+    logging.info("Result: {0}".format(result))
+
+    return result