X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=bb962890d0d8bd37ab10779bbd305eba557e5cf4;hb=refs%2Fchanges%2F91%2F32191%2F23;hp=4bee6e343ef9a6e69f64cb5e91fa03695758836e;hpb=8c2e2aaef7289df6b394faccb4b5ae050e33f43a;p=csit.git diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 4bee6e343e..bb962890d0 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 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: @@ -323,7 +323,8 @@ def table_merged_details(table, input_data): suite_name = suite[u"name"] table_lst = list() for test in data.keys(): - if data[test][u"parent"] not in suite_name: + if data[test][u"status"] != u"PASS" or \ + data[test][u"parent"] not in suite_name: continue row_lst = list() for column in table[u"columns"]: @@ -351,10 +352,12 @@ def table_merged_details(table, input_data): col_data = col_data.split(u" |br| ", 1)[1] except IndexError: pass + col_data = col_data.replace(u'\n', u' |br| ').\ + replace(u'\r', u'').replace(u'"', u"'") col_data = f" |prein| {col_data} |preout| " elif column[u"data"].split(u" ")[1] in \ (u"conf-history", u"show-run"): - col_data = col_data.replace(u" |br| ", u"", 1) + col_data = col_data.replace(u'\n', u' |br| ') col_data = f" |prein| {col_data[:-5]} |preout| " row_lst.append(f'"{col_data}"') except KeyError: @@ -386,12 +389,7 @@ def _tpc_modify_test_name(test_name, ignore_nic=False): :rtype: str """ test_name_mod = test_name.\ - replace(u"-ndrpdrdisc", u""). \ replace(u"-ndrpdr", u"").\ - replace(u"-pdrdisc", u""). \ - replace(u"-ndrdisc", u"").\ - replace(u"-pdr", u""). \ - replace(u"-ndr", u""). \ replace(u"1t1c", u"1c").\ replace(u"2t1c", u"1c"). \ replace(u"2t2c", u"2c").\ @@ -425,7 +423,7 @@ def _tpc_insert_data(target, src, include_tests): """Insert src data to the target structure. :param target: Target structure where the data is placed. - :param src: Source data to be placed into the target stucture. + :param src: Source data to be placed into the target structure. :param include_tests: Which results will be included (MRR, NDR, PDR). :type target: list :type src: dict @@ -990,27 +988,27 @@ 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 - testbed in (u"2n-skx", u"3n-skx", u"2n-clx")): + testbed in (u"2n-skx", u"3n-skx", u"2n-clx", u"2n-zn2")): cores = u"2t1c" elif u"4t2c" in test_name or \ (u"-2c-" in test_name and - testbed in (u"2n-skx", u"3n-skx", u"2n-clx")): + testbed in (u"2n-skx", u"3n-skx", u"2n-clx", u"2n-zn2")): cores = u"4t2c" elif u"8t4c" in test_name or \ (u"-4c-" in test_name and - testbed in (u"2n-skx", u"3n-skx", u"2n-clx")): + testbed in (u"2n-skx", u"3n-skx", u"2n-clx", u"2n-zn2")): cores = u"8t4c" else: cores = u"" @@ -1031,7 +1029,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: @@ -1047,7 +1045,7 @@ def _generate_url(testbed, test_name): elif u"oacl50s" in test_name: bsf = u"features-oacl50" elif u"nat44det" in test_name: - bsf = u"nat44det" + bsf = u"nat44det-bidir" elif u"nat44ed" in test_name and u"udir" in test_name: bsf = u"nat44ed-udir" elif u"-cps" in test_name and u"ethip4udp" in test_name: @@ -1058,12 +1056,18 @@ 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: bsf = u"features" elif u"policer" in test_name: bsf = u"features" + elif u"adl" in test_name: + bsf = u"features" elif u"cop" in test_name: bsf = u"features" elif u"nat" in test_name: @@ -1079,8 +1083,24 @@ def _generate_url(testbed, test_name): if u"114b" in test_name and u"vhost" in test_name: domain = u"vts" - elif u"nat44" in test_name or u"-pps" in test_name or u"-vps" in test_name: + elif u"nat44" in test_name or u"-pps" in test_name or u"-cps" in test_name: domain = u"nat44" + if u"nat44det" in test_name: + domain += u"-det-bidir" + else: + domain += u"-ed" + if u"udir" in test_name: + domain += u"-unidir" + elif u"-ethip4udp-" in test_name: + domain += u"-udp" + elif u"-ethip4tcp-" in test_name: + domain += u"-tcp" + if u"-cps" in 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: @@ -1109,6 +1129,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: @@ -1228,8 +1250,8 @@ def table_perf_trending_dash_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 @@ -1501,8 +1523,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 @@ -2039,7 +2061,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))