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:
+ groups = re.search(REGEX_NIC, tst_data["parent"])
+ nic = groups.group(0) if groups else ""
+ name = "{0}-{1}".format(nic, "-".join(tst_data["name"].
+ split("-")[:-1]))
+ 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").\
+ replace("4t4c", "4c").replace("8t4c", "4c")
+ tbl_dict[tst_name_mod] = {"name": name,
+ "ref-data": list(),
+ "cmp-data": list()}
try:
# TODO: Re-work when NDRPDRDISC tests are not used
if table["include-tests"] == "MRR":
tst_data["throughput"]["NDR"]["LOWER"])
else:
continue
- except KeyError:
+ except (KeyError, TypeError):
pass
- except TypeError:
- tbl_dict.pop(tst_name_mod, None)
if history:
for item in history:
for job, builds in item["data"].items():
item.append(round(stdev(data_t) / 1000000, 2))
else:
item.extend([None, None])
- if item[-4] is not None and item[-2] is not None and item[-4] != 0:
+ if "dot1q" in tbl_dict[tst_name]["name"]:
+ item.append("Changed methodology")
+ elif item[-4] is not None and item[-2] is not None and item[-4] != 0:
item.append(int(relative_change(float(item[-4]), float(item[-2]))))
- if len(item) == len(header):
+ else:
+ item.append("n/a")
+ if (len(item) == len(header)) and (item[-3] is not None):
tbl_lst.append(item)
# Sort the table according to the relative change
item.append(round(stdev(data_t) / 1000000, 2))
else:
item.extend([None, None])
- if item[-4] is not None and item[-2] is not None and item[-4] != 0:
+ if "dot1q" in tbl_dict[tst_name]["name"]:
+ item.append("Changed methodology")
+ elif item[-4] is not None and item[-2] is not None and item[-4] != 0:
item.append(int(relative_change(float(item[-4]), float(item[-2]))))
else:
- item.append(None)
- if len(item) == len(header):
+ item.append("n/a")
+ if (len(item) == len(header)) and (item[-3] is not None):
tbl_lst.append(item)
# Sort the table according to the relative change