[dhcp_relay] Verify configured DHCP relay hop limits - #26321
Draft
Xichen96 wants to merge 1 commit into
Draft
Conversation
Collaborator
|
/azp run |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| num_expected_packets = self.num_dhcp_servers | ||
| if self.agent_relay_mode == "discard" or self.dhcpv4_disable_flag or self.max_hop_count == self.MAX_HOP_COUNT: | ||
| # Expected result: No packet sent | ||
| if self.expected_forward is None: |
Pass independent incoming hop counts and forwarding expectations into PTF coverage so a configured lower limit cannot pass while runtime remains at 16. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2b881aa9-3a3a-4aaf-b2ca-b941705b2438 Signed-off-by: Xichen96 <lukelin0907@gmail.com>
Xichen96
force-pushed
the
dev/xichenlin/item10-max-hop-test
branch
from
July 19, 2026 17:39
28e0084 to
3f127d6
Compare
Collaborator
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
6 tasks
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
3 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.
Description of PR
Summary:
Repair the max-hop hardware/PTF coverage so configured thresholds are actually discriminated. PTF now accepts an explicit incoming hop count and an independent expected forward/drop result. The test configures a limit of 2 and proves incoming 1 forwards with hops 2 while incoming 2 drops; it also retains the limit-16 boundary.
This is a low-priority draft placeholder for a non-current deployment scenario. It depends on sonic-net/sonic-dhcp-relay#123 and may intentionally fail on current images until that product dependency merges. DRAFT — MUST NOT MERGE.
Fixes # N/A — draft test placeholder; no issue is linked.
Type of change
Back port request
Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO): N/A; no backport requested.
Failure type: other — low-priority test coverage gap for a non-current deployment scenario.
Tested branch
Test result
NOT RUN: no pytest, PTF, syntax-check, or hardware validation was executed.
Validation is intentionally deferred until the higher-priority DHCP relay PRs merge.
This draft must not merge before its dependency and validation TODOs are complete.
Dependency TODO: rebase/validate after [dhcp4relay] Apply configured maximum hop count sonic-dhcp-relay#123 merges.
Validation TODO: run the focused hardware/PTF cases for configured limits 2 and 16 after the higher-priority DHCP relay PRs merge.
Approach
What is the motivation for this PR?
The previous test derived packet input and expectation from the configured maximum, so it passed even when the daemon ignored a configured value of 2 and continued using 16.
How did you do it?
Pass explicit incoming hop counts and expected forwarding decisions to PTF, verify forwarded hops are incremented, and use a broad DHCP mask for negative cases so any upstream relay packet fails the drop assertion.
How did you verify/test it?
No validation was executed. Validation is deferred until the higher-priority DHCP relay PRs merge. This draft must not merge before the dependency and validation TODOs above are complete.
Any platform specific information?
Native sonic-relay-agent coverage; no ISC-specific behavior is asserted.
Supported testbed topology if it's a new test case?
Existing t0 and m0 DHCP relay topologies.
Documentation
No documentation update. This draft only adds or corrects DHCP relay test coverage.