Skip to content

Fix testQosSaiDscpToPgMapping issue #15378

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
bingwang-ms merged 1 commit into from
Nov 6, 2024
Merged

Fix testQosSaiDscpToPgMapping issue #15378

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
24 changes: 17 additions & 7 deletions tests/saitests/py3/sai_qos_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,11 +1193,11 @@ def runTest(self):
print(list(map(operator.sub, pg_cntrs, pg_cntrs_base)),
file=sys.stderr)
for i in range(0, PG_NUM):
# DNX/Chassis:
# pg = 0 => Some extra packets with unmarked TC
# pg = 4 => Extra packets for LACP/BGP packets
# pg = 7 => packets from cpu to front panel ports
if platform_asic and platform_asic in ["broadcom-dnx", "cisco-8000"]:
if platform_asic and platform_asic == "broadcom-dnx":
# DNX/Chassis:
# pg = 0 => Some extra packets with unmarked TC
# pg = 4 => Extra packets for LACP/BGP packets
# pg = 7 => packets from cpu to front panel ports
if i == pg:
if i == 3:
assert (pg_cntrs[pg] == pg_cntrs_base[pg] + len(dscps))
Expand All @@ -1210,9 +1210,19 @@ def runTest(self):
assert (pg_cntrs[i] == pg_cntrs_base[i])
else:
if i == pg:
assert (pg_cntrs[pg] == pg_cntrs_base[pg] + len(dscps))
if i == 0 or i == 4:
assert (pg_cntrs[pg] >=
pg_cntrs_base[pg] + len(dscps))
else:
assert (pg_cntrs[pg] ==
pg_cntrs_base[pg] + len(dscps))
else:
assert (pg_cntrs[i] == pg_cntrs_base[i])
# LACP packets are mapped to queue0 and tcp syn packets for BGP to queue4
# So for those queues the count could be more
if i == 0 or i == 4:
assert (pg_cntrs[i] >= pg_cntrs_base[i])
else:
assert (pg_cntrs[i] == pg_cntrs_base[i])
# confirm that dscp pkts are received
total_recv_cnt = 0
dscp_recv_cnt = 0
Expand Down