Skip to content

[action] [PR:10226] limit the modification of pg_num to only occur on the specific platform to fix testQosSaiHeadroomPoolWatermark failure #10376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 1 commit into from
Oct 18, 2023
Merged

[action] [PR:10226] limit the modification of pg_num to only occur on the specific platform to fix testQosSaiHeadroomPoolWatermark failure #10376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions tests/qos/test_qos_sai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,16 +833,23 @@ def testQosSaiHeadroomPoolWatermark(
dst_dut_index = get_src_dst_asic_and_duts['dst_dut_index']
src_asic_index = get_src_dst_asic_and_duts['src_asic_index']
dst_asic_index = get_src_dst_asic_and_duts['dst_asic_index']
src_ports = dutConfig['testPortIds'][src_dut_index][src_asic_index]
if get_src_dst_asic_and_duts['src_asic'] == get_src_dst_asic_and_duts['dst_asic']:
# Src and dst are the same asics, leave one for dst port and the rest for src ports
qosConfig["hdrm_pool_size"]["src_port_ids"] = src_ports[:-1]
qosConfig["hdrm_pool_size"]["dst_port_id"] = src_ports[-1]
qosConfig["hdrm_pool_size"]["pgs_num"] = 2 * len(qosConfig["hdrm_pool_size"]["src_port_ids"])
else:
qosConfig["hdrm_pool_size"]["src_port_ids"] = src_ports
qosConfig["hdrm_pool_size"]["dst_port_id"] = dutConfig['testPortIds'][dst_dut_index][dst_asic_index][-1]
qosConfig["hdrm_pool_size"]["pgs_num"] = 2 * len(qosConfig["hdrm_pool_size"]["src_port_ids"])

if ('platform_asic' in dutTestParams["basicParams"] and
dutTestParams["basicParams"]["platform_asic"] == "broadcom-dnx"):
# Need to adjust hdrm_pool_size src_port_ids, dst_port_id and pgs_num based on how many source and dst ports
# present
src_ports = dutConfig['testPortIds'][src_dut_index][src_asic_index]
if get_src_dst_asic_and_duts['src_asic'] == get_src_dst_asic_and_duts['dst_asic']:
# Src and dst are the same asics, leave one for dst port and the rest for src ports
qosConfig["hdrm_pool_size"]["src_port_ids"] = src_ports[:-1]
qosConfig["hdrm_pool_size"]["dst_port_id"] = src_ports[-1]
qosConfig["hdrm_pool_size"]["pgs_num"] = 2 * len(qosConfig["hdrm_pool_size"]["src_port_ids"])
else:
qosConfig["hdrm_pool_size"]["src_port_ids"] = src_ports
qosConfig["hdrm_pool_size"]["dst_port_id"] = dutConfig['testPortIds'][dst_dut_index][dst_asic_index][-1]
qosConfig["hdrm_pool_size"]["pgs_num"] = 2 * len(qosConfig["hdrm_pool_size"]["src_port_ids"])

self.updateTestPortIdIp(dutConfig, get_src_dst_asic_and_duts, qosConfig["hdrm_pool_size"])

testParams = dict()
testParams.update(dutTestParams["basicParams"])
Expand Down