aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2018-03-23 12:10:35 +0100
committerTibor Frank <tifrank@cisco.com>2018-03-23 12:10:35 +0100
commit0354ec6ac7b0c633a9f4c7007c0cba43bc05acbd (patch)
tree019aae8158f7dc3428d767112e812954afabcc04
parenta09211590e3de1cb45c1ad1e0aae6fd84bf15c14 (diff)
CSIT-1004: Generate csv and txt tables with trending and statistical data
Change-Id: I50ba76c06621a9a293a5327b5b7709e4df6a4756 Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--docs/cpta/trending/data.rst8
-rw-r--r--docs/cpta/trending/index.rst1
-rw-r--r--resources/tools/presentation/generator_CPTA.py46
-rwxr-xr-xresources/tools/presentation/run_cpta.sh5
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml1
-rw-r--r--resources/tools/presentation/specification_parser.py3
6 files changed, 56 insertions, 8 deletions
diff --git a/docs/cpta/trending/data.rst b/docs/cpta/trending/data.rst
new file mode 100644
index 0000000000..14ada67d8b
--- /dev/null
+++ b/docs/cpta/trending/data.rst
@@ -0,0 +1,8 @@
+Trending Data
+=============
+
+The data used to generate the trending plots is available in a CSV and
+pretty ASCII formats:
+
+ - `csv format <../_static/vpp/cpta-trending.csv>`_,
+ - `pretty ASCII format <../_static/vpp/cpta-trending.txt>`_,
diff --git a/docs/cpta/trending/index.rst b/docs/cpta/trending/index.rst
index 47dc032a6e..6014788cb4 100644
--- a/docs/cpta/trending/index.rst
+++ b/docs/cpta/trending/index.rst
@@ -10,3 +10,4 @@ VPP Performance Trend
vm_vhost
container_memif
ipsec
+ data
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 09d2e444ae..8ae0662e36 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
@@ -358,6 +360,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 +381,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
+ chart_data[test_name][int(idx)] = None
+
+ # 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 +408,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,
@@ -417,6 +435,24 @@ 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='"')
+ for row in csv_content:
+ if txt_table is None:
+ txt_table = prettytable.PrettyTable(row)
+ else:
+ 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:
diff --git a/resources/tools/presentation/run_cpta.sh b/resources/tools/presentation/run_cpta.sh
index 233e8dfbe2..6ba962d778 100755
--- a/resources/tools/presentation/run_cpta.sh
+++ b/resources/tools/presentation/run_cpta.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-set +x
+set -x
# set default values in config array
typeset -A DIR
@@ -33,5 +33,6 @@ python pal.py \
--logging INFO \
--force
-RETURN_STATUS=$(echo $?)
+RETURN_STATUS=$?
+echo ${RETURN_STATUS}
exit ${RETURN_STATUS}
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 61e4e0e530..8b5f59ed06 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -216,6 +216,7 @@
algorithm: "cpta"
output-file-type: ".html"
output-file: "{DIR[STATIC,VPP]}/cpta"
+ data: "plot-performance-trending"
plots:
# L2
diff --git a/resources/tools/presentation/specification_parser.py b/resources/tools/presentation/specification_parser.py
index 2659c29ca5..ca9c19c93e 100644
--- a/resources/tools/presentation/specification_parser.py
+++ b/resources/tools/presentation/specification_parser.py
@@ -389,7 +389,8 @@ class Specification(object):
else:
# defined as a range <start, end (build number)>
build_nr = builds.get("end", None)
- builds = [x for x in range(1, int(build_nr)+1)]
+ builds = [x for x in range(builds["start"],
+ int(build_nr)+1)]
self.configuration["data-sets"][set_name][job] = builds
logging.info("Done.")