diff --git a/ansible/module_utils/port_utils.py b/ansible/module_utils/port_utils.py index 1affde3dffd..8c04a560b6f 100644 --- a/ansible/module_utils/port_utils.py +++ b/ansible/module_utils/port_utils.py @@ -142,19 +142,29 @@ def get_port_alias_to_name_map(hwsku, asic_name=None): port_alias_to_name_map["Ethernet65"] = "Ethernet512" port_alias_to_name_map["Ethernet66"] = "Ethernet513" elif hwsku == "Arista-7060X6-64PE-B-C512S2": + split_alias_list = ["a", "b", "c", "d", "e", "f", "g", "h"] for i in range(1, 65): - for j in range(1, 9): - port_alias_to_name_map["Ethernet%d/%d" % (i, j)] = "Ethernet%d" % ((i - 1) * 8 + j - 1) - port_alias_to_name_map["Ethernet65"] = "Ethernet512" - port_alias_to_name_map["Ethernet66"] = "Ethernet513" + for idx, split_alias in enumerate(split_alias_list): + alias = "etp{}{}".format(i, split_alias) + eth_name = "Ethernet{}".format((i - 1) * 8 + idx) + port_alias_to_name_map[alias] = eth_name + port_alias_to_name_map['etp65'] = "Ethernet512" + port_alias_to_name_map['etp66'] = "Ethernet513" elif hwsku == "Arista-7060X6-64PE-B-C448O16": + split_alias_list = ["a", "b", "c", "d", "e", "f", "g", "h"] + split_alias_list_1 = ["a", "b"] + split_2_port_indexs = [13, 14, 17, 18, 45, 46, 49, 50] for i in range(1, 65): - if i in [13, 14, 17, 18, 45, 46, 49, 50]: - for j in [1, 5]: - port_alias_to_name_map["Ethernet%d/%d" % (i, j)] = "Ethernet%d" % ((i - 1) * 8 + j - 1) + if i in split_2_port_indexs: + for idx, split_alias in enumerate(split_alias_list_1): + alias = "etp{}{}".format(i, split_alias) + eth_name = "Ethernet{}".format((i - 1) * 8 + idx * 4) + port_alias_to_name_map[alias] = eth_name else: - for j in range(1, 9): - port_alias_to_name_map["Ethernet%d/%d" % (i, j)] = "Ethernet%d" % ((i - 1) * 8 + j - 1) + for idx, split_alias in enumerate(split_alias_list): + alias = "etp{}{}".format(i, split_alias) + eth_name = "Ethernet{}".format((i - 1) * 8 + idx) + port_alias_to_name_map[alias] = eth_name elif hwsku == "Arista-7050QX32S-Q32": for i in range(5, 29): port_alias_to_name_map["Ethernet%d/1" % i] = "Ethernet%d" % ((i - 5) * 4)