Skip to content

Commit

Permalink
Support new hwsku Cisco-8101-O8V48 (#16583)
Browse files Browse the repository at this point in the history
Signed-off-by: Kevin Wang <shengkaiwang@microsoft.com>
  • Loading branch information
kevinskwang authored Jan 21, 2025
1 parent 48ac199 commit 89c7650
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ansible/group_vars/sonic/variables
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ barefoot_hwskus: [ "montara", "mavericks", "Arista-7170-64C", "newport", "Arista
marvell_hwskus: [ "et6448m", "Nokia-7215" ]
innovium_tl7_hwskus: ["Wistron_sw_to3200k_32x100" , "Wistron_sw_to3200k"]

cisco_hwskus: ["Cisco-8102-C64", "Cisco-8101-T32", "Cisco-8111-O32", "Cisco-8101-C64", "Cisco-8101-C48T8", "Cisco-8101-O8C48", "Cisco-8111-C32", "Cisco-8111-O32", "Cisco-8111-O64", "Cisco-8122-O64", "Cisco-8122-O64S2", "Cisco-8122-O128", "Cisco-8800-LC-48H-C48", "Cisco-88-LC0-36FH-M-O36", "Cisco-88-LC0-36FH-O36", "cisco-8101-p4-32x100-vs"]
cisco-8000_gb_hwskus: ["Cisco-8102-C64", "Cisco-8101-T32", "Cisco-8101-O32", "Cisco-8101-C64", "Cisco-8101-C48T8", "Cisco-8101-O8C48", "Cisco-8111-C32", "Cisco-88-LC0-36FH-M-O36", "Cisco-88-LC0-36FH-O36"]
cisco_hwskus: ["Cisco-8102-C64", "Cisco-8101-T32", "Cisco-8111-O32", "Cisco-8101-C64", "Cisco-8101-C48T8", "Cisco-8101-O8V48", "Cisco-8101-O8C48","Cisco-8111-C32", "Cisco-8111-O32", "Cisco-8111-O64", "Cisco-8122-O64", "Cisco-8122-O64S2", "Cisco-8122-O128", "Cisco-8800-LC-48H-C48", "Cisco-88-LC0-36FH-M-O36", "Cisco-88-LC0-36FH-O36", "cisco-8101-p4-32x100-vs"]
cisco-8000_gb_hwskus: ["Cisco-8102-C64", "Cisco-8101-T32", "Cisco-8101-O32", "Cisco-8101-C64", "Cisco-8101-C48T8", "Cisco-8101-O8V48", "Cisco-8101-O8C48","Cisco-8111-C32", "Cisco-88-LC0-36FH-M-O36", "Cisco-88-LC0-36FH-O36"]
cisco-8000_gr_hwskus: ["Cisco-8111-O32", "Cisco-8111-O64"]
cisco-8000_gr2_hwskus: ["Cisco-8122-O64", "Cisco-8122-O64S2", "Cisco-8122-O128"]
cisco-8000_pac_hwskus: ["Cisco-8800-LC-48H-C48"]
Expand Down
2 changes: 1 addition & 1 deletion ansible/module_utils/port_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ def get_port_alias_to_name_map(hwsku, asic_name=None):
elif hwsku in ["Cisco-8111-O64"]:
for i in range(0, 64):
port_alias_to_name_map["etp%d" % i] = "Ethernet%d" % (i * 4)
elif hwsku == "Cisco-8101-O8C48":
elif hwsku in ["Cisco-8101-O8C48", "Cisco-8101-O8V48"]:
for i in range(0, 12):
port_alias_to_name_map["etp%da" % i] = "Ethernet%d" % (i * 4 * 2)
port_alias_to_name_map["etp%db" % i] = "Ethernet%d" % ((i * 4 * 2) + 4)
Expand Down
4 changes: 2 additions & 2 deletions tests/qos/qos_sai_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ def __buildTestPorts(self, request, testPortIds, testPortIps, src_port_ids, dst_
else:
srcPorts = [1]
if (get_src_dst_asic_and_duts["src_asic"].sonichost.facts["hwsku"]
in ["Cisco-8101-O8C48", "Cisco-8102-28FH-DPU-O-T1"]):
in ["Cisco-8101-O8C48", "Cisco-8101-O8V48", "Cisco-8102-28FH-DPU-O-T1"]):
srcPorts = [testPortIds[0][0].index(uplinkPortIds[0])]
dstPorts = [testPortIds[0][0].index(x) for x in uplinkPortIds[1:4]]
logging.debug("Test Port dst:{}, src:{}".format(dstPorts, srcPorts))
Expand Down Expand Up @@ -1060,7 +1060,7 @@ def dutConfig(
if (use_separated_upkink_dscp_tc_map or
(get_src_dst_asic_and_duts["src_asic"]
.sonichost.facts["hwsku"]
in ["Cisco-8101-O8C48", "Cisco-8102-28FH-DPU-O-T1"])):
in ["Cisco-8101-O8C48", "Cisco-8101-O8V48", "Cisco-8102-28FH-DPU-O-T1"])):
neighName = src_mgFacts["minigraph_neighbors"].get(portName, {}).get("name", "").lower()
if 't0' in neighName:
downlinkPortIds.append(portIndex)
Expand Down

0 comments on commit 89c7650

Please sign in to comment.