[dhcp_relay]:filter out the ipv6 address of dhcp server for dhcp rela…#3397
Merged
lguohan merged 2 commits intosonic-net:masterfrom Sep 6, 2019
Merged
[dhcp_relay]:filter out the ipv6 address of dhcp server for dhcp rela…#3397lguohan merged 2 commits intosonic-net:masterfrom
lguohan merged 2 commits intosonic-net:masterfrom
Conversation
…y(v4) config file. Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
lguohan
reviewed
Sep 3, 2019
Contributor
|
Retest mellanox please |
jleveque
suggested changes
Sep 5, 2019
dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
Outdated
Show resolved
Hide resolved
Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
Contributor
|
Retest mellanox please |
jleveque
approved these changes
Sep 6, 2019
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.
…y(v4) config file.
Signed-off-by: wangshengjun wangshengjun@asterfusion.com
- What I did
For dhcp relay docker, the startup command (command=/usr/sbin/dhcrelay -d) of dhcp relay only for ipv4. But the command 'dhcrelay' option for dhcp server address doesn't filter out ipv6 address.
- How I did it
Add the filter of dhcp server address to select the ipv4 address.
- How to verify it
add the ipv6 address of dhcp servers for vlan interface
"Vlan1000": {
"dhcp_servers": [
"192.0.0.1",
"3302::1238"
],
"vlanid": "1000"
}
load the config
generate the config file 'docker-dhcp-relay.supervisord.conf'
sonic-cfggen -d -t /usr/share/sonic/templates/docker-dhcp-relay.supervisord.conf.j2
check the dhcp relay section
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)