Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dhcp_relay]:filter out the ipv6 address of dhcp server for dhcp rela… #3397

Merged
merged 2 commits into from
Sep 6, 2019

Conversation

wangshengjun
Copy link
Contributor

@wangshengjun wangshengjun commented Aug 30, 2019

…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

  1. add the ipv6 address of dhcp servers for vlan interface
    "Vlan1000": {
    "dhcp_servers": [
    "192.0.0.1",
    "3302::1238"
    ],
    "vlanid": "1000"
    }

  2. load the config

  3. generate the config file 'docker-dhcp-relay.supervisord.conf'
    sonic-cfggen -d -t /usr/share/sonic/templates/docker-dhcp-relay.supervisord.conf.j2

  4. check the dhcp relay section

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

…y(v4) config file.

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
@jleveque
Copy link
Contributor

jleveque commented Sep 5, 2019

Retest mellanox please

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
@jleveque
Copy link
Contributor

jleveque commented Sep 6, 2019

Retest mellanox please

@lguohan lguohan merged commit 9fdc6bd into sonic-net:master Sep 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants