X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_CPTA.py;h=4f722574dd6e6e99aba70ec3458f384df198ec0d;hb=7b1f19c0c338f5d8eb65fb45b57bb5de84398762;hp=f230a64c2f5e0c82713dd8c705465b0f839404ef;hpb=b8287ec997b2d426818fc095f2e4b49ec95d9f49;p=csit.git
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index f230a64c2f..4f722574dd 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -14,8 +14,6 @@
"""Generation of Continuous Performance Trending and Analysis.
"""
-import multiprocessing
-import os
import logging
import csv
import prettytable
@@ -25,9 +23,9 @@ import plotly.exceptions as plerr
from collections import OrderedDict
from datetime import datetime
+from copy import deepcopy
-from utils import archive_input_data, execute_command, \
- classify_anomalies, Worker
+from utils import archive_input_data, execute_command, classify_anomalies
# Command to build the html format of the report
@@ -137,7 +135,8 @@ def generate_cpta(spec, data):
css_file:
css_file.write(THEME_OVERRIDES)
- archive_input_data(spec)
+ if spec.configuration.get("archive-inputs", True):
+ archive_input_data(spec)
logging.info("Done.")
@@ -174,28 +173,29 @@ def _generate_trending_traces(in_data, job_name, build_info,
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}")
+ hover_str = ("date: {date}
"
+ "value: {value:,}
"
+ "{sut}-ref: {build}
"
+ "csit-ref: mrr-{period}-build-{build_nr}
"
+ "testbed: {testbed}")
if "dpdk" in job_name:
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))
+ date=date,
+ value=int(in_data[idx].avg),
+ sut="dpdk",
+ build=build_info[job_name][str(idx)][1].rsplit('~', 1)[0],
+ period="weekly",
+ build_nr=idx,
+ testbed=build_info[job_name][str(idx)][2]))
elif "vpp" in job_name:
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))
+ date=date,
+ value=int(in_data[idx].avg),
+ sut="vpp",
+ build=build_info[job_name][str(idx)][1].rsplit('~', 1)[0],
+ period="daily",
+ build_nr=idx,
+ testbed=build_info[job_name][str(idx)][2]))
xaxis.append(datetime(int(date[0:4]), int(date[4:6]), int(date[6:8]),
int(date[9:11]), int(date[12:])))
@@ -321,7 +321,7 @@ def _generate_all_charts(spec, input_data):
:type input_data: InputData
"""
- def _generate_chart(_, data_q, graph):
+ def _generate_chart(graph):
"""Generates the chart.
"""
@@ -346,6 +346,7 @@ def _generate_all_charts(spec, input_data):
return
chart_data = dict()
+ chart_tags = dict()
for job, job_data in data.iteritems():
if job != job_name:
continue
@@ -356,6 +357,7 @@ def _generate_all_charts(spec, input_data):
try:
chart_data[test_name][int(index)] = \
test["result"]["receive-rate"]
+ chart_tags[test_name] = test.get("tags", None)
except (KeyError, TypeError):
pass
@@ -368,58 +370,145 @@ def _generate_all_charts(spec, input_data):
itm = itm.avg
tst_lst.append(str(itm))
csv_tbl.append("{0},".format(tst_name) + ",".join(tst_lst) + '\n')
+
# Generate traces:
traces = list()
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]
- 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)
+ groups = graph.get("groups", None)
+ visibility = list()
+
+ if groups:
+ for group in groups:
+ visible = list()
+ for tag in group:
+ 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
+ if tag in chart_tags[test_name]:
+ message = "index: {index}, test: {test}".format(
+ index=index, test=test_name)
+ test_name = test_name.split('.')[-1]
+ 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)
+ visible.extend([True for _ in range(len(trace))])
+ res.append(rslt)
+ index += 1
+ break
+ visibility.append(visible)
+ else:
+ 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]
+ 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
- continue
- traces.extend(trace)
- res.append(rslt)
- index += 1
if traces:
# Generate the chart:
- graph["layout"]["xaxis"]["title"] = \
- graph["layout"]["xaxis"]["title"].format(job=job_name)
+ try:
+ layout = deepcopy(graph["layout"])
+ except KeyError as err:
+ logging.error("Finished with error: No layout defined")
+ logging.error(repr(err))
+ return
+ if groups:
+ show = list()
+ for i in range(len(visibility)):
+ visible = list()
+ for r in range(len(visibility)):
+ for _ in range(len(visibility[r])):
+ visible.append(i == r)
+ show.append(visible)
+
+ buttons = list()
+ buttons.append(dict(
+ label="All",
+ method="update",
+ args=[{"visible": [True for _ in range(len(show[0]))]}, ]
+ ))
+ for i in range(len(groups)):
+ try:
+ label = graph["group-names"][i]
+ except (IndexError, KeyError):
+ label = "Group {num}".format(num=i + 1)
+ buttons.append(dict(
+ label=label,
+ method="update",
+ args=[{"visible": show[i]}, ]
+ ))
+
+ layout['updatemenus'] = list([
+ dict(
+ active=0,
+ type="dropdown",
+ direction="down",
+ xanchor="left",
+ yanchor="bottom",
+ x=-0.12,
+ y=1.0,
+ buttons=buttons
+ )
+ ])
+
name_file = "{0}-{1}{2}".format(spec.cpta["output-file"],
graph["output-file-name"],
spec.cpta["output-file-type"])
logs.append(("INFO", " Writing the file '{0}' ...".
format(name_file)))
- plpl = plgo.Figure(data=traces, layout=graph["layout"])
+ plpl = plgo.Figure(data=traces, layout=layout)
try:
ploff.plot(plpl, show_link=False, auto_open=False,
filename=name_file)
except plerr.PlotlyEmptyDataError:
logs.append(("WARNING", "No data for the plot. Skipped."))
- data_out = {
- "job_name": job_name,
- "csv_table": csv_tbl,
- "results": res,
- "logs": logs
- }
- data_q.put(data_out)
+ for level, line in logs:
+ if level == "INFO":
+ logging.info(line)
+ elif level == "ERROR":
+ logging.error(line)
+ elif level == "DEBUG":
+ logging.debug(line)
+ elif level == "CRITICAL":
+ logging.critical(line)
+ elif level == "WARNING":
+ logging.warning(line)
+
+ return {"job_name": job_name, "csv_table": csv_tbl, "results": res}
builds_dict = dict()
for job in spec.input["builds"].keys():
@@ -427,40 +516,27 @@ def _generate_all_charts(spec, input_data):
builds_dict[job] = list()
for build in spec.input["builds"][job]:
status = build["status"]
- if status != "failed" and status != "not found":
+ if status != "failed" and status != "not found" and \
+ status != "removed":
builds_dict[job].append(str(build["build"]))
# Create "build ID": "date" dict:
build_info = dict()
+ tb_tbl = spec.environment.get("testbeds", None)
for job_name, job_data in builds_dict.items():
if build_info.get(job_name, None) is None:
build_info[job_name] = OrderedDict()
for build in job_data:
+ testbed = ""
+ tb_ip = input_data.metadata(job_name, build).get("testbed", "")
+ if tb_ip and tb_tbl:
+ testbed = tb_tbl.get(tb_ip, "")
build_info[job_name][build] = (
input_data.metadata(job_name, build).get("generated", ""),
- input_data.metadata(job_name, build).get("version", "")
+ input_data.metadata(job_name, build).get("version", ""),
+ testbed
)
- work_queue = multiprocessing.JoinableQueue()
- manager = multiprocessing.Manager()
- data_queue = manager.Queue()
- cpus = multiprocessing.cpu_count()
-
- workers = list()
- for cpu in range(cpus):
- worker = Worker(work_queue,
- data_queue,
- _generate_chart)
- worker.daemon = True
- worker.start()
- workers.append(worker)
- os.system("taskset -p -c {0} {1} > /dev/null 2>&1".
- format(cpu, worker.pid))
-
- for chart in spec.cpta["plots"]:
- work_queue.put((chart, ))
- work_queue.join()
-
anomaly_classifications = list()
# Create the header:
@@ -477,31 +553,12 @@ def _generate_all_charts(spec, input_data):
header = "Version:," + ",".join(versions) + '\n'
csv_tables[job_name].append(header)
- while not data_queue.empty():
- result = data_queue.get()
+ for chart in spec.cpta["plots"]:
+ result = _generate_chart(chart)
anomaly_classifications.extend(result["results"])
csv_tables[result["job_name"]].extend(result["csv_table"])
- for item in result["logs"]:
- if item[0] == "INFO":
- logging.info(item[1])
- elif item[0] == "ERROR":
- logging.error(item[1])
- elif item[0] == "DEBUG":
- logging.debug(item[1])
- elif item[0] == "CRITICAL":
- logging.critical(item[1])
- elif item[0] == "WARNING":
- logging.warning(item[1])
-
- del data_queue
-
- # Terminate all workers
- for worker in workers:
- worker.terminate()
- worker.join()
-
# Write the tables:
for job_name, csv_table in csv_tables.items():
file_name = spec.cpta["output-file"] + "-" + job_name + "-trending"