Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Trending: Fix ipsec
[csit.git]
/
resources
/
tools
/
presentation
/
generator_tables.py
diff --git
a/resources/tools/presentation/generator_tables.py
b/resources/tools/presentation/generator_tables.py
index
3bfae47
..
5c4452d
100644
(file)
--- a/
resources/tools/presentation/generator_tables.py
+++ b/
resources/tools/presentation/generator_tables.py
@@
-27,7
+27,7
@@
from datetime import datetime as dt
from datetime import timedelta
from utils import mean, stdev, relative_change, classify_anomalies, \
from datetime import timedelta
from utils import mean, stdev, relative_change, classify_anomalies, \
- convert_csv_to_pretty_txt
+ convert_csv_to_pretty_txt
, relative_change_stdev
REGEX_NIC = re.compile(r'\d*ge\dp\d\D*\d*')
REGEX_NIC = re.compile(r'\d*ge\dp\d\D*\d*')
@@
-616,6
+616,7
@@
def table_soak_vs_ndr(table, input_data):
item.append(round(data_r_stdev / 1000000, 2))
else:
data_r_mean = None
item.append(round(data_r_stdev / 1000000, 2))
else:
data_r_mean = None
+ data_r_stdev = None
item.extend([None, None])
data_c = tbl_dict[tst_name]["cmp-data"]
if data_c:
item.extend([None, None])
data_c = tbl_dict[tst_name]["cmp-data"]
if data_c:
@@
-625,9
+626,9
@@
def table_soak_vs_ndr(table, input_data):
item.append(round(data_c_stdev / 1000000, 2))
else:
data_c_mean = None
item.append(round(data_c_stdev / 1000000, 2))
else:
data_c_mean = None
+ data_c_stdev = None
item.extend([None, None])
item.extend([None, None])
- if data_r_mean and data_c_mean is not None:
- item.append(round(relative_change(data_r_mean, data_c_mean), 2))
+ if data_r_mean and data_c_mean:
delta, d_stdev = relative_change_stdev(
data_r_mean, data_c_mean, data_r_stdev, data_c_stdev)
item.append(round(delta, 2))
delta, d_stdev = relative_change_stdev(
data_r_mean, data_c_mean, data_r_stdev, data_c_stdev)
item.append(round(delta, 2))
@@
-681,7
+682,7
@@
def table_performance_trending_dashboard(table, input_data):
for job, builds in table["data"].items():
for build in builds:
for tst_name, tst_data in data[job][str(build)].iteritems():
for job, builds in table["data"].items():
for build in builds:
for tst_name, tst_data in data[job][str(build)].iteritems():
- if tst_name.lower() in table
["ignore-list"]
:
+ if tst_name.lower() in table
.get("ignore-list", list())
:
continue
if tbl_dict.get(tst_name, None) is None:
groups = re.search(REGEX_NIC, tst_data["parent"])
continue
if tbl_dict.get(tst_name, None) is None:
groups = re.search(REGEX_NIC, tst_data["parent"])
@@
-824,6
+825,10
@@
def _generate_url(base, testbed, test_name):
elif "ipsec" in test_name:
file_name = "ipsec"
feature = "-base-scale"
elif "ipsec" in test_name:
file_name = "ipsec"
feature = "-base-scale"
+ if "hw-" in test_name:
+ file_name = "ipsechw"
+ elif "sw-" in test_name:
+ file_name = "ipsecsw"
elif "ethip4lispip" in test_name or "ethip4vxlan" in test_name:
file_name = "ip4_tunnels"
elif "ethip4lispip" in test_name or "ethip4vxlan" in test_name:
file_name = "ip4_tunnels"
@@
-904,8
+909,8
@@
def _generate_url(base, testbed, test_name):
elif "8t4c" in test_name:
anchor += "8t4c"
elif "8t4c" in test_name:
anchor += "8t4c"
- return url + file_name + '-' + testbed + '-' + nic + framesize +
feature +
\
-
anchor + feature
+ return url + file_name + '-' + testbed + '-' + nic + framesize + \
+
feature.replace("-int", "").replace("-tnl", "") +
anchor + feature
def table_performance_trending_dashboard_html(table, input_data):
def table_performance_trending_dashboard_html(table, input_data):
@@
-1073,7
+1078,7
@@
def table_failed_tests(table, input_data):
for build in builds:
build = str(build)
for tst_name, tst_data in data[job][build].iteritems():
for build in builds:
build = str(build)
for tst_name, tst_data in data[job][build].iteritems():
- if tst_name.lower() in table
["ignore-list"]
:
+ if tst_name.lower() in table
.get("ignore-list", list())
:
continue
if tbl_dict.get(tst_name, None) is None:
groups = re.search(REGEX_NIC, tst_data["parent"])
continue
if tbl_dict.get(tst_name, None) is None:
groups = re.search(REGEX_NIC, tst_data["parent"])