Skip to content

[dhcp_relay] Fix ACL drop count validation for expanded DHCP packet types #20370

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

Closed
dhanasekar-arista wants to merge 3 commits into from
Closed

[dhcp_relay] Fix ACL drop count validation for expanded DHCP packet types #20370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f678c01
Ignore pkt trim errors on non-TH5 ASICs
dhanasekar-arista Aug 20, 2025
b1c2acb
Fix line length violations in ignore_pkt_trim_errors fixture
dhanasekar-arista Aug 22, 2025
9a2a34e
[dhcp_relay] Fix ACL drop count validation for expanded DHCP packet t…
dhanasekar-arista Aug 22, 2025
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
25 changes: 25 additions & 0 deletions tests/common/plugins/loganalyzer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,28 @@ def loganalyzer(duthosts, request, log_rotate_modular_chassis):
)
consolidated_bughandler = get_bughandler_instance({"type": "consolidated"})
consolidated_bughandler.bug_handler_wrapper(analyzers, duthosts, la_results)


@pytest.fixture(autouse=True)
def ignore_pkt_trim_errors(duthosts, loganalyzer):
ASIC_LIST = ["th5"]
if loganalyzer:
for duthost in duthosts:
platform_asic = duthost.facts["platform_asic"].lower()
asic_name = duthost.get_asic_name().lower()
if platform_asic == "broadcom" and asic_name not in ASIC_LIST:
# We should cleanup this code once CSP12420291 is fixed.
loganalyzer[duthost.hostname].ignore_regex.extend(
[
r".*ERR syncd#syncd: .* SAI_API_SWITCH:"
r"_brcm_sai_xgs_pkt_trim_get_mapped_counter:[\d]+ Packet trim feature is not supported.*",
r".*ERR syncd#syncd: .* SAI_API_QUEUE:"
r"_brcm_sai_xgs_queue_pkt_trim_get_clear_ctr:[\d]+ "
r"Get Trim mapped counter failed with error -2.*",
r".*ERR syncd#syncd: .* SAI_API_QUEUE:"
r"_brcm_sai_cosq_stat_get:[\d]+ Get Trim stats packets failed with error -2.*",
r".*ERR syncd#syncd: .* SAI_API_SWITCH:"
r"sai_query_switch_attribute_enum_values_capability:[\d]+ "
r"packet trim Enum Capability values get for [\d]+ failed with error -2.*"
]
)
2 changes: 1 addition & 1 deletion tests/dhcp_relay/test_dhcp_relay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def verify_acl_drop_on_standby_tor(rand_unselected_dut, dut_dhcp_relay_data, tes
if testing_mode == DUAL_TOR_MODE and "dualtor-aa" not in tbinfo["topo"]["name"]:
for client_interface_name, item in pre_client_dhcp_acl_counts.items():
after_count = get_acl_count_by_mark(rand_unselected_dut, item["mark"])
pytest_assert(after_count == item["count"] + 3, "Drop count of {} {} is unexpected, pre: {}, after: {}"
pytest_assert(after_count == item["count"] + 7, "Drop count of {} {} is unexpected, pre: {}, after: {}"
.format(client_interface_name, item["mark"], item["count"], after_count))


Expand Down
Loading