X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=b03261c6d8ed03114928260fce44609869668d31;hb=3faf5e9192489b8f850757d6179311a59243a95b;hp=0d8b27208cffb0e2c20cc28e3851f57a3f6cb465;hpb=9446b9bf9c15999feec3c8a48fec428bca094500;p=csit.git diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 0d8b27208c..b03261c6d8 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -990,15 +990,15 @@ def _generate_url(testbed, test_name): if u"1t1c" in test_name or \ (u"-1c-" in test_name and - testbed in (u"3n-hsw", u"3n-tsh", u"2n-dnv", u"3n-dnv")): + testbed in (u"3n-hsw", u"3n-tsh", u"2n-dnv", u"3n-dnv", u"2n-tx2")): cores = u"1t1c" elif u"2t2c" in test_name or \ (u"-2c-" in test_name and - testbed in (u"3n-hsw", u"3n-tsh", u"2n-dnv", u"3n-dnv")): + testbed in (u"3n-hsw", u"3n-tsh", u"2n-dnv", u"3n-dnv", u"2n-tx2")): cores = u"2t2c" elif u"4t4c" in test_name or \ (u"-4c-" in test_name and - testbed in (u"3n-hsw", u"3n-tsh", u"2n-dnv", u"3n-dnv")): + testbed in (u"3n-hsw", u"3n-tsh", u"2n-dnv", u"3n-dnv", u"2n-tx2")): cores = u"4t4c" elif u"2t1c" in test_name or \ (u"-1c-" in test_name and @@ -1031,7 +1031,7 @@ def _generate_url(testbed, test_name): if u"macip-iacl1s" in test_name: bsf = u"features-macip-iacl1" elif u"macip-iacl10s" in test_name: - bsf = u"features-macip-iacl01" + bsf = u"features-macip-iacl10" elif u"macip-iacl50s" in test_name: bsf = u"features-macip-iacl50" elif u"iacl1s" in test_name: @@ -1058,6 +1058,10 @@ def _generate_url(testbed, test_name): bsf = u"udp-pps" elif u"-pps" in test_name and u"ethip4tcp" in test_name: bsf = u"tcp-pps" + elif u"-tput" in test_name and u"ethip4udp" in test_name: + bsf = u"udp-tput" + elif u"-tput" in test_name and u"ethip4tcp" in test_name: + bsf = u"tcp-tput" elif u"udpsrcscale" in test_name: bsf = u"features-udp" elif u"iacl" in test_name: @@ -1097,6 +1101,8 @@ def _generate_url(testbed, test_name): domain += u"-cps" elif u"-pps" in test_name: domain += u"-pps" + elif u"-tput" in test_name: + domain += u"-tput" elif u"testpmd" in test_name or u"l3fwd" in test_name: domain = u"dpdk" elif u"memif" in test_name: @@ -1125,6 +1131,8 @@ def _generate_url(testbed, test_name): bsf += u"-hw" elif u"ethip4vxlan" in test_name: domain = u"ip4_tunnels" + elif u"ethip4udpgeneve" in test_name: + domain = u"ip4_tunnels" elif u"ip4base" in test_name or u"ip4scale" in test_name: domain = u"ip4" elif u"ip6base" in test_name or u"ip6scale" in test_name: @@ -1517,8 +1525,8 @@ def table_failed_tests_html(table, input_data): u"a", attrib=dict( href=f"{lnk_dir}" - f"{_generate_url(table.get(u'testbed', ''), item)}" - f"{lnk_sufix}" + f"{_generate_url(table.get(u'testbed', ''), item)}" + f"{lnk_sufix}" ) ) ref.text = item @@ -2055,7 +2063,7 @@ def table_weekly_comparison(table, in_data): # Reorganize header in txt table txt_table = list() with open(txt_file_name, u"rt", encoding='utf-8') as file_handler: - for line in file_handler: + for line in list(file_handler): txt_table.append(line) try: txt_table.insert(5, txt_table.pop(2))