Skip to content

Add non-unicast noise filter to LossyQueueTest ingress drop checks #23340

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

Open
XuChen-MSFT wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −20
Open

Add non-unicast noise filter to LossyQueueTest ingress drop checks #23340

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
52 changes: 32 additions & 20 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 @@ -5057,25 +5057,33 @@ def runTest(self):
# & may give inconsistent test results
# Adding COUNTER_MARGIN to provide room to 2 pkt incase, extra traffic received
for cntr in ingress_counters:
if (platform_asic and
platform_asic in ["broadcom-dnx", "marvell-teralynx"]):
if cntr == 1:
log_message("recv_counters_base: {}, recv_counters: {}".format(
recv_counters_base[cntr], recv_counters[cntr]), to_stderr=True)
dnx_asics = ["broadcom-dnx", "marvell-teralynx"]
counter_margin = COUNTER_MARGIN if (
platform_asic and platform_asic in dnx_asics) else 0
# Check if ingress drop is caused by environmental non-unicast noise
if not ignore_ingress_drop_caused_by_nonunicast_noise(
self.src_client, port_list['src'][src_port_id],
recv_counters, recv_counters_base, cntr,
counter_margin=counter_margin):
if (platform_asic and
platform_asic in ["broadcom-dnx", "marvell-teralynx"]):
if cntr == 1:
log_message("recv_counters_base: {}, recv_counters: {}".format(
recv_counters_base[cntr], recv_counters[cntr]), to_stderr=True)
qos_test_assert(
self,
recv_counters[cntr] <= recv_counters_base[cntr] + COUNTER_MARGIN,
"Ingress drop encountered: {} packets dropped on "
"counter {} ({})".format(
recv_counters[cntr] - recv_counters_base[cntr],
cntr, port_counter_fields[cntr]))
else:
qos_test_assert(
self,
recv_counters[cntr] <= recv_counters_base[cntr] + COUNTER_MARGIN,
self, recv_counters[cntr] == recv_counters_base[cntr],
"Ingress drop encountered: {} packets dropped on "
"counter {} ({})".format(
recv_counters[cntr] - recv_counters_base[cntr],
cntr, port_counter_fields[cntr]))
else:
qos_test_assert(
self, recv_counters[cntr] == recv_counters_base[cntr],
"Ingress drop encountered: {} packets dropped on "
"counter {} ({})".format(
recv_counters[cntr] - recv_counters_base[cntr],
cntr, port_counter_fields[cntr]))
# xmit port no egress drop
for cntr in egress_counters:
qos_test_assert(
Expand Down Expand Up @@ -5126,12 +5134,16 @@ def runTest(self):
recv_counters[cntr] - recv_counters_base[cntr],
cntr, port_counter_fields[cntr]))
else:
qos_test_assert(
self, recv_counters[cntr] == recv_counters_base[cntr],
"Ingress drop encountered: {} packets dropped on "
"counter {} ({})".format(
recv_counters[cntr] - recv_counters_base[cntr],
cntr, port_counter_fields[cntr]))
# Check if ingress drop is caused by environmental non-unicast noise
if not ignore_ingress_drop_caused_by_nonunicast_noise(
self.src_client, port_list['src'][src_port_id],
recv_counters, recv_counters_base, cntr):
qos_test_assert(
self, recv_counters[cntr] == recv_counters_base[cntr],
"Ingress drop encountered: {} packets dropped on "
"counter {} ({})".format(
recv_counters[cntr] - recv_counters_base[cntr],
cntr, port_counter_fields[cntr]))

# xmit port egress drop
if platform_asic and platform_asic == "broadcom-dnx" and dut_asic != 'q3d':
Expand Down
Loading