Skip to content

[action] [PR:24605] Fixing a packet trimming counter test failure seen on TH5 #1197

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
mssonicbld wants to merge 1 commit into
base: 202412
Choose a base branch
from
+9 −3
Open

[action] [PR:24605] Fixing a packet trimming counter test failure seen on TH5 #1197

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion tests/packet_trimming/base_packet_trimming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,11 @@ def test_trimming_counters(self, duthost, ptfadapter, test_params, trim_counter_
# Trigger trimmed packets on queue6
counter_kwargs = self.get_verify_trimmed_counter_packet_kwargs(duthost, ptfadapter,
{**trim_counter_params})
counter_kwargs.update({'expect_packets': False})
# TH5 cannot completely block egress queues, so trimmed packets will leak out of the trim queues.
if duthost.get_asic_name() == "th5":
counter_kwargs.update({'expect_packets': "skip"})
else:
counter_kwargs.update({'expect_packets': False})
verify_trimmed_packet(**counter_kwargs)

# Get the TrimDrop counters on switch level
Expand Down
6 changes: 4 additions & 2 deletions tests/packet_trimming/packet_trimming_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ def verify_packet_trimming(duthost, ptfadapter, ingress_port, egress_port, block
verify_ports = [egress_port['ptf_id']]

# Verify packet based on expectation
if expect_packets:
if expect_packets is True:
logger.info(
f"Expecting packets on ports {verify_ports} with size {recv_pkt_size} and DSCP {recv_pkt_dscp}")
_, matched = testutils.verify_packet_any_port(
Expand All @@ -928,7 +928,7 @@ def verify_packet_trimming(duthost, ptfadapter, ingress_port, egress_port, block
logger.info(
f"Successfully verified {packet_type} packet trimming with size {recv_pkt_size} "
f"and DSCP {recv_pkt_dscp}")
else:
elif expect_packets is False:
logger.info(f"Expecting NO packets on any of ports {verify_ports}")
testutils.verify_no_packet_any(
ptfadapter,
Expand All @@ -937,6 +937,8 @@ def verify_packet_trimming(duthost, ptfadapter, ingress_port, egress_port, block
timeout=timeout
)
logger.info(f"Successfully verified NO {packet_type} packets were received as expected")
else:
logger.info(f"Skip capturing packets on ports {verify_ports}.")

return True

Expand Down
Loading