Modify dhcp relay to pick primary address#17012
Merged
lguohan merged 7 commits intosonic-net:masterfrom Nov 22, 2023
Merged
Conversation
Contributor
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
prsunny
reviewed
Nov 18, 2023
Contributor
prsunny
left a comment
prsunny
left a comment
There was a problem hiding this comment.
Can you also add unit tests?
| @@ -0,0 +1,114 @@ | |||
| diff --git a/common/discover.c b/common/discover.c | |||
kellyyeh
approved these changes
Nov 22, 2023
prsunny
previously approved these changes
Nov 22, 2023
7 tasks
Contributor
Author
I have added test cases in the following PRs: sonic-net/sonic-mgmt#10828 and #17263 The second one is expected to fail as the vlan_interface changes in #16827 and the current PR changes are not in. |
yxieca
pushed a commit
that referenced
this pull request
Dec 4, 2023
This is change taken as part of the HLD: sonic-net/SONiC#1470 and this is a follow up on the PR #16827 where in the docker-dhcp we pick the value of primary gateway of the interface from the VLAN_Interface table which has "secondary" flag set in the config_db Microsoft ADO (number only): 16784946 How did I do it - Changes in the j2 file to add a new "-pg" parameter in the dhcpv4-relay.agents.j2, the ip would be retrieved from the config db's vlan_interface table such that the interface which are picked will have secondary field set. - Changes in isc-dhcp to re-order the addresses of the discovered interface and which has the ip which has the passed parameter.
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
4 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.
Why I did it
This is change taken as part of the HLD: sonic-net/SONiC#1470 and this is a follow up on the PR #16827 where in the docker-dhcp we pick the value of primary gateway of the interface from the VLAN_Interface table which has "secondary" flag set in the config_db
Work item tracking
How I did it
1: Changes in the j2 file to add a new "-pg" parameter in the dhcpv4-relay.agents.j2, the ip would be retrieved from the config db's vlan_interface table such that the interface which are picked will have secondary field set.
2: Changes in isc-dhcp to re-order the addresses of the discovered interface and which has the ip which has the passed parameter.
How to verify it
Validated using the existing test cases.
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Modify dhcp relay to pick primary address
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)