X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=a3373db6d8ba4c7bf37fbf6c2772676525210a36;hb=803610d9ca0c1afd345db4d2858d4aa93a5233ed;hp=1bbe8e38d44c3c439772e6ff2c828c53437e539d;hpb=8853921639f749a0e49e37759df2b973947977e3;p=csit.git diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 1bbe8e38d4..a3373db6d8 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -240,11 +240,14 @@ def table_performance_comparison(table, input_data): replace("1t1c", "1c").replace("2t1c", "1c").\ replace("2t2c", "2c").replace("4t2c", "2c").\ replace("4t4c", "4c").replace("8t4c", "4c") + if "across topologies" in table["title"].lower(): + tst_name_mod = tst_name_mod.replace("2n1l-", "") if tbl_dict.get(tst_name_mod, None) is None: name = "{0}-{1}".format(tst_data["parent"].split("-")[0], "-".join(tst_data["name"]. split("-")[:-1])) - if "comparison across testbeds" in table["title"].lower(): + if "across testbeds" in table["title"].lower() or \ + "across topologies" in table["title"].lower(): name = name.\ replace("1t1c", "1c").replace("2t1c", "1c").\ replace("2t2c", "2c").replace("4t2c", "2c").\ @@ -286,6 +289,8 @@ def table_performance_comparison(table, input_data): replace("1t1c", "1c").replace("2t1c", "1c").\ replace("2t2c", "2c").replace("4t2c", "2c").\ replace("4t4c", "4c").replace("8t4c", "4c") + if "across topologies" in table["title"].lower(): + tst_name_mod = tst_name_mod.replace("2n1l-", "") try: # TODO: Re-work when NDRPDRDISC tests are not used if table["include-tests"] == "MRR": @@ -323,6 +328,8 @@ def table_performance_comparison(table, input_data): replace("1t1c", "1c").replace("2t1c", "1c").\ replace("2t2c", "2c").replace("4t2c", "2c").\ replace("4t4c", "4c").replace("8t4c", "4c") + if "across topologies" in table["title"].lower(): + tst_name_mod = tst_name_mod.replace("2n1l-", "") if tbl_dict.get(tst_name_mod, None) is None: continue if tbl_dict[tst_name_mod].get("history", None) is None: @@ -542,6 +549,9 @@ def _generate_url(base, testbed, test_name): if "lbdpdk" in test_name or "lbvpp" in test_name: file_name = "link_bonding" + elif "114b" in test_name and "vhost" in test_name: + file_name = "vts" + elif "testpmd" in test_name or "l3fwd" in test_name: file_name = "dpdk" @@ -555,7 +565,9 @@ def _generate_url(base, testbed, test_name): elif "vhost" in test_name: if "l2xcbase" in test_name or "l2bdbasemaclrn" in test_name: file_name = "vm_vhost_l2" - if "l2xcbase" in test_name: + if "114b" in test_name: + feature = "" + elif "l2xcbase" in test_name: feature = "-base-l2xc" elif "l2bdbasemaclrn" in test_name: feature = "-base-l2bd"