Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ansible/group_vars/sonic/variables
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ mellanox_spc2_hwskus: [ 'ACS-MSN3700', 'ACS-MSN3700C', 'ACS-MSN3800', 'Mellanox-
mellanox_spc3_hwskus: [ 'ACS-MSN4700', 'Mellanox-SN4700-O28', 'Mellanox-SN4700-O32', 'ACS-MSN4600', 'ACS-MSN4600C', 'ACS-MSN4410', 'Mellanox-SN4600C-D112C8', 'Mellanox-SN4600C-C64', 'Mellanox-SN4700-O8C48', 'Mellanox-SN4700-O8V48', 'ACS-SN4280', 'Mellanox-SN4280-O28', 'Mellanox-SN4700-V64', 'Mellanox-SN4700-O32']
mellanox_spc4_hwskus: [ 'ACS-SN5600' , 'Mellanox-SN5600-V256', 'Mellanox-SN5600-C256S1', 'Mellanox-SN5600-C224O8',
'Mellanox-SN5610N-C256S2', 'Mellanox-SN5610N-C224O8']
mellanox_hwskus: "{{ mellanox_spc1_hwskus + mellanox_spc2_hwskus + mellanox_spc3_hwskus + mellanox_spc4_hwskus }}"
mellanox_spc5_hwskus: [ Mellanox-SN5640-C512S2', 'Mellanox-SN5640-C448O16']
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there is a missing leading '.

Will go with this PR: #18921

mellanox_hwskus: "{{ mellanox_spc1_hwskus + mellanox_spc2_hwskus + mellanox_spc3_hwskus + mellanox_spc4_hwskus + mellanox_spc5_hwskus }}"
mellanox_dualtor_hwskus: [ 'Mellanox-SN4600C-C64' ]

cavium_hwskus: [ "AS7512", "XP-SIM" ]
Expand Down
26 changes: 26 additions & 0 deletions ansible/module_utils/port_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,32 @@ def get_port_alias_to_name_map(hwsku, asic_name=None):
port_alias_to_name_map['etp65'] = "Ethernet512"
if hwsku == "Mellanox-SN5610N-C224O8":
port_alias_to_name_map['etp66'] = "Ethernet520"
elif hwsku in ["Mellanox-SN5640-C512S2"]:
split_alias_list = ["a", "b", "c", "d", "e", "f", "g", "h"]
for i in range(1, 65):
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'] = "Ethernet520"
elif hwsku in ["Mellanox-SN5640-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 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 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'] = "Ethernet520"
elif hwsku == "ACS-SN4280":
for i in range(0, 256, 8):
port_alias_to_name_map["Ethernet%d" % i] = "Ethernet%d" % i
Expand Down
4 changes: 3 additions & 1 deletion tests/common/mellanox_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
"Mellanox-SN4600C-D112C8", "Mellanox-SN4600C-C64", "ACS-SN4280", "Mellanox-SN4280-O28"]
SPC4_HWSKUS = ["ACS-SN5600", "Mellanox-SN5600-V256", "Mellanox-SN5600-C256S1", "Mellanox-SN5600-C224O8",
'Mellanox-SN5610N-C256S2', 'Mellanox-SN5610N-C224O8']
SWITCH_HWSKUS = SPC1_HWSKUS + SPC2_HWSKUS + SPC3_HWSKUS + SPC4_HWSKUS
SPC5_HWSKUS = ["Mellanox-SN5640-C512S2", "Mellanox-SN5640-C448O16"]

SWITCH_HWSKUS = SPC1_HWSKUS + SPC2_HWSKUS + SPC3_HWSKUS + SPC4_HWSKUS + SPC5_HWSKUS

PSU_CAPABILITIES = [
['psu{}_curr', 'psu{}_curr_in', 'psu{}_power', 'psu{}_power_in', 'psu{}_volt', 'psu{}_volt_in', 'psu{}_volt_out'],
Expand Down
Loading