[dhcp_relay] Only call 'wait_until_iface_ready' once for each interface#3317
Merged
jleveque merged 1 commit intosonic-net:masterfrom Aug 9, 2019
Merged
[dhcp_relay] Only call 'wait_until_iface_ready' once for each interface#3317jleveque merged 1 commit intosonic-net:masterfrom
jleveque merged 1 commit intosonic-net:masterfrom
Conversation
…each interface.(sonic-net#3316) Signed-off-by: wangshengjun <[email protected]>
wangshengjun
changed the title
jleveque
approved these changes
Aug 9, 2019
jleveque
changed the title
wangshengjun
added a commit
to wangshengjun/sonic-buildimage
that referenced
this pull request
Nov 16, 2020
…ce (sonic-net#3317) Signed-off-by: wangshengjun <[email protected]>
mssonicbld
added a commit
that referenced
this pull request
Nov 20, 2024
…lly (#20853) #### Why I did it src/sonic-swss ``` * 1843de4 - (HEAD -> master, origin/master, origin/HEAD) Ensure second route group OID is correct (#3380) (2 hours ago) [Lawrence Lee] * c86efa1 - Added support for "UNDERLAY_SET_DSCP" and "UNDERLAY_SET_DSCPV6" tables (#3307) (2 hours ago) [siqbal1986] * 0b331f0 - platform/innovium renaming to platform/marvell-teralynx (#3252) (10 hours ago) [krismarvell] * c865803 - [mirror] erspan ipv6 underlay (see PR #1817) (#3317) (30 hours ago) [mramezani95] ``` #### How I did it #### How to verify it #### Description for the changelog
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.
[dhcp_relay]'wait_for_init.sh.j2' translate duplicate if the interface has both ipv4 and ipv6 address #3316
Signed-off-by: wangshengjun [email protected]
- What I did
When the interface has configured both ipv4 and ipv6 address, the 'wait_until_iface_ready' function called twice .So the j2 template of 'wait_for_init.sh.j2' was changed to fix the problem.
- How I did it
- How to verify it
1.configure the interface with both ipv4 and ipv6 addresses.
part of config file
....
"PORTCHANNEL_INTERFACE": {
"PortChannel0001": {},
"PortChannel0002": {},
"PortChannel0001|10.0.0.56/31": {},
"PortChannel0001|FC00::71/126": {},
"PortChannel0002|10.0.0.58/31": {},
"PortChannel0002|FC00::75/126": {}
},
...
2.check the 'wait_for_init.sh' translated by 'wait_for_init.sh.j2' according to the configuration.
function wait_until_iface_ready
{
.....
}
Wait for all interfaces to be up and ready
wait_until_iface_ready ${LAG_TABLE_PREFIX} PortChannel0001
wait_until_iface_ready ${LAG_TABLE_PREFIX} PortChannel0002
The 'wait_until_iface_ready' function should call once for each interface.