[dhcp_relay] Fix ACL drop count validation for expanded DHCP packet types#20370
Closed
dhanasekar-arista wants to merge 3 commits intosonic-net:masterfrom
Closed
[dhcp_relay] Fix ACL drop count validation for expanded DHCP packet types#20370dhanasekar-arista wants to merge 3 commits intosonic-net:masterfrom
dhanasekar-arista wants to merge 3 commits intosonic-net:masterfrom
Conversation
We have raised a CSP12420291 to get this fixed in SAI, until then we can ignore these errors in loganalyzer. Co-authored-by: Amp <[email protected]> Amp-Thread-ID: https://ampcode.com/threads/T-40b37838-f16e-453b-9f4c-81aa8a177132
- Split long lines to meet code style requirements (max 120 chars) - Break up conditional statement and regex patterns - Maintain regex functionality while improving readability Fixes pre_test failure reported in review comment.
…ypes - Update expected ACL drop count from 3 to 7 in verify_acl_drop_on_standby_tor fixture - Aligns with PR sonic-net#20059 that expanded DHCP packet types from 3 to 7: (Unknown, Discover, Request, Bootp, Decline, Release, Inform) - Fixes teardown validation failures in dual-ToR testbeds Signed-off-by: Dhanasekar <[email protected]> Co-authored-by: Amp <[email protected]> Amp-Thread-ID: https://ampcode.com/threads/T-1c1a042e-0917-4ecf-a747-9dbbdb8a0743
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
Author
|
Closing this PR - created from wrong branch. Will create a clean PR from master. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is the motivation for this PR?
Fix DHCP relay test failures in dual-ToR testbeds caused by ACL drop count validation mismatch after PR #20059.
Issue Description
Root Cause
PR #20059 (Aug 2025) expanded DHCP packet types from 3 to 7:
The
verify_acl_drop_on_standby_torfixture still expected 3 drops, causing validation failures.How did you do it?
Update expected ACL drop count from 3 to 7 in the fixture validation logic.
How did you verify/test it?
Related Issues
Test Results
This fix will resolve teardown failures while maintaining functional test coverage.