X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=b37b1fe91a6d9d50885df6a52f7d566c6f38a1be;hb=3e58c2f916288c5ed22ce11f01fa56a4d19689d2;hp=05a696c2144246a1391ea751b9176dc309b25b59;hpb=7960d8258471725aa9eee40101abf4030b3bb5e1;p=csit.git diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 05a696c214..b37b1fe91a 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -682,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(): - 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"]) @@ -825,6 +825,14 @@ def _generate_url(base, testbed, test_name): 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" + if "-int-" in test_name: + feature = "-base-scale-int" + elif "tnl" in test_name: + feature = "-base-scale-tnl" elif "ethip4lispip" in test_name or "ethip4vxlan" in test_name: file_name = "ip4_tunnels" @@ -872,6 +880,8 @@ def _generate_url(base, testbed, test_name): nic = "vic1227-" elif "vic1385" in test_name: nic = "vic1385-" + elif "x553" in test_name: + nic = "x553-" else: nic = "" anchor += nic @@ -905,8 +915,8 @@ def _generate_url(base, testbed, test_name): 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): @@ -1074,7 +1084,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(): - 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"])