X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_CPTA.py;h=38e9fbbdd035ada3deeb374297e97cdecb8877f1;hp=40fed8be78771c03fcf793f7aef2c8cabe5b15b1;hb=6319502b111ba4ada612adc82e5e1c431fca2795;hpb=67c6fbcb8c531d1013ee4cc866e6743589a90ba2
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 40fed8be78..38e9fbbdd0 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -22,12 +22,11 @@ import prettytable
import plotly.offline as ploff
import plotly.graph_objs as plgo
import plotly.exceptions as plerr
-import pandas as pd
from collections import OrderedDict
from datetime import datetime
-from utils import split_outliers, archive_input_data, execute_command,\
+from utils import archive_input_data, execute_command, \
classify_anomalies, Worker
@@ -87,24 +86,22 @@ def generate_cpta(spec, data):
return ret_code
-def _generate_trending_traces(in_data, job_name, build_info, moving_win_size=10,
+def _generate_trending_traces(in_data, job_name, build_info,
show_trend_line=True, name="", color=""):
"""Generate the trending traces:
- samples,
- - trimmed moving median (trending line)
- outliers, regress, progress
+ - average of normal samples (trending line)
:param in_data: Full data set.
:param job_name: The name of job which generated the data.
:param build_info: Information about the builds.
- :param moving_win_size: Window size.
:param show_trend_line: Show moving median (trending plot).
:param name: Name of the plot
:param color: Name of the color for the plot.
:type in_data: OrderedDict
:type job_name: str
:type build_info: dict
- :type moving_win_size: int
:type show_trend_line: bool
:type name: str
:type color: str
@@ -118,47 +115,62 @@ def _generate_trending_traces(in_data, job_name, build_info, moving_win_size=10,
hover_text = list()
xaxis = list()
for idx in data_x:
+ date = build_info[job_name][str(idx)][0]
+ hover_str = ("date: {0}
"
+ "value: {1:,}
"
+ "{2}-ref: {3}
"
+ "csit-ref: mrr-{4}-build-{5}")
if "dpdk" in job_name:
- hover_text.append("dpdk-ref: {0}
csit-ref: mrr-weekly-build-{1}".
- format(build_info[job_name][str(idx)][1].
- rsplit('~', 1)[0], idx))
+ hover_text.append(hover_str.format(
+ date,
+ int(in_data[idx].avg),
+ "dpdk",
+ build_info[job_name][str(idx)][1].
+ rsplit('~', 1)[0],
+ "weekly",
+ idx))
elif "vpp" in job_name:
- hover_text.append("vpp-ref: {0}
csit-ref: mrr-daily-build-{1}".
- format(build_info[job_name][str(idx)][1].
- rsplit('~', 1)[0], idx))
- date = build_info[job_name][str(idx)][0]
+ hover_text.append(hover_str.format(
+ date,
+ int(in_data[idx].avg),
+ "vpp",
+ build_info[job_name][str(idx)][1].
+ rsplit('~', 1)[0],
+ "daily",
+ idx))
+
xaxis.append(datetime(int(date[0:4]), int(date[4:6]), int(date[6:8]),
int(date[9:11]), int(date[12:])))
- data_pd = pd.Series(data_y, index=xaxis)
+ data_pd = OrderedDict()
+ for key, value in zip(xaxis, data_y):
+ data_pd[key] = value
- t_data, outliers = split_outliers(data_pd, outlier_const=1.5,
- window=moving_win_size)
- anomaly_classification = classify_anomalies(t_data, window=moving_win_size)
+ anomaly_classification, avgs = classify_anomalies(data_pd)
- anomalies = pd.Series()
+ anomalies = OrderedDict()
anomalies_colors = list()
+ anomalies_avgs = list()
anomaly_color = {
- "outlier": 0.0,
- "regression": 0.33,
- "normal": 0.66,
+ "regression": 0.0,
+ "normal": 0.5,
"progression": 1.0
}
if anomaly_classification:
- for idx, item in enumerate(data_pd.items()):
+ for idx, (key, value) in enumerate(data_pd.iteritems()):
if anomaly_classification[idx] in \
("outlier", "regression", "progression"):
- anomalies = anomalies.append(pd.Series([item[1], ],
- index=[item[0], ]))
+ anomalies[key] = value
anomalies_colors.append(
anomaly_color[anomaly_classification[idx]])
- anomalies_colors.extend([0.0, 0.33, 0.66, 1.0])
+ anomalies_avgs.append(avgs[idx])
+ anomalies_colors.extend([0.0, 0.5, 1.0])
# Create traces
trace_samples = plgo.Scatter(
x=xaxis,
- y=data_y,
+ y=[y.avg for y in data_y],
mode='markers',
line={
"width": 1
@@ -172,13 +184,31 @@ def _generate_trending_traces(in_data, job_name, build_info, moving_win_size=10,
"symbol": "circle",
},
text=hover_text,
- hoverinfo="x+y+text+name"
+ hoverinfo="text"
)
traces = [trace_samples, ]
+ if show_trend_line:
+ trace_trend = plgo.Scatter(
+ x=xaxis,
+ y=avgs,
+ mode='lines',
+ line={
+ "shape": "linear",
+ "width": 1,
+ "color": color,
+ },
+ showlegend=False,
+ legendgroup=name,
+ name='{name}'.format(name=name),
+ text=["trend: {0:,}".format(int(avg)) for avg in avgs],
+ hoverinfo="text+name"
+ )
+ traces.append(trace_trend)
+
trace_anomalies = plgo.Scatter(
x=anomalies.keys(),
- y=anomalies.values,
+ y=anomalies_avgs,
mode='markers',
hoverinfo="none",
showlegend=False,
@@ -188,13 +218,11 @@ def _generate_trending_traces(in_data, job_name, build_info, moving_win_size=10,
"size": 15,
"symbol": "circle-open",
"color": anomalies_colors,
- "colorscale": [[0.00, "grey"],
- [0.25, "grey"],
- [0.25, "red"],
- [0.50, "red"],
- [0.50, "white"],
- [0.75, "white"],
- [0.75, "green"],
+ "colorscale": [[0.00, "red"],
+ [0.33, "red"],
+ [0.33, "white"],
+ [0.66, "white"],
+ [0.66, "green"],
[1.00, "green"]],
"showscale": True,
"line": {
@@ -209,8 +237,8 @@ def _generate_trending_traces(in_data, job_name, build_info, moving_win_size=10,
"size": 14
},
"tickmode": 'array',
- "tickvals": [0.125, 0.375, 0.625, 0.875],
- "ticktext": ["Outlier", "Regression", "Normal", "Progression"],
+ "tickvals": [0.167, 0.500, 0.833],
+ "ticktext": ["Regression", "Normal", "Progression"],
"ticks": "",
"ticklen": 0,
"tickangle": -90,
@@ -220,24 +248,6 @@ def _generate_trending_traces(in_data, job_name, build_info, moving_win_size=10,
)
traces.append(trace_anomalies)
- if show_trend_line:
- data_trend = t_data.rolling(window=moving_win_size,
- min_periods=2).median()
- trace_trend = plgo.Scatter(
- x=data_trend.keys(),
- y=data_trend.tolist(),
- mode='lines',
- line={
- "shape": "spline",
- "width": 1,
- "color": color,
- },
- showlegend=False,
- legendgroup=name,
- name='{name}-trend'.format(name=name)
- )
- traces.append(trace_trend)
-
if anomaly_classification:
return traces, anomaly_classification[-1]
else:
@@ -287,7 +297,7 @@ def _generate_all_charts(spec, input_data):
chart_data[test_name] = OrderedDict()
try:
chart_data[test_name][int(index)] = \
- test["result"]["throughput"]
+ test["result"]["receive-rate"]
except (KeyError, TypeError):
pass
@@ -296,25 +306,34 @@ def _generate_all_charts(spec, input_data):
tst_lst = list()
for bld in builds_dict[job_name]:
itm = tst_data.get(int(bld), '')
+ if not isinstance(itm, str):
+ itm = itm.avg
tst_lst.append(str(itm))
csv_tbl.append("{0},".format(tst_name) + ",".join(tst_lst) + '\n')
# Generate traces:
traces = list()
- win_size = 14
index = 0
for test_name, test_data in chart_data.items():
if not test_data:
logs.append(("WARNING", "No data for the test '{0}'".
format(test_name)))
continue
+ message = "index: {index}, test: {test}".format(
+ index=index, test=test_name)
test_name = test_name.split('.')[-1]
- trace, rslt = _generate_trending_traces(
- test_data,
- job_name=job_name,
- build_info=build_info,
- moving_win_size=win_size,
- name='-'.join(test_name.split('-')[3:-1]),
- color=COLORS[index])
+ try:
+ trace, rslt = _generate_trending_traces(
+ test_data,
+ job_name=job_name,
+ build_info=build_info,
+ name='-'.join(test_name.split('-')[2:-1]),
+ color=COLORS[index])
+ except IndexError:
+ message = "Out of colors: {}".format(message)
+ logs.append(("ERROR", message))
+ logging.error(message)
+ index += 1
+ continue
traces.extend(trace)
res.append(rslt)
index += 1