Skip to content

[dhcp_relay] Remove dhcpv6 servers from VlanBrief #9718

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.

Sign up for GitHub

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

Merged
kellyyeh merged 4 commits into from
Jan 19, 2022
Merged

[dhcp_relay] Remove dhcpv6 servers from VlanBrief #9718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
389b75e
Remove dhcpv6 server from VlanBrief
kellyyeh Jan 10, 2022
64fe432
Remove test
kellyyeh Jan 10, 2022
041d62b
Update test_show_dhcp_relay.py
kellyyeh Jan 10, 2022
6b71401
Update show_dhcp_relay.py
kellyyeh Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockers/docker-dhcp-relay/cli-plugin-tests/test_show_dhcp_relay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ def test_plugin_registration(self):

def test_dhcp_relay_column_output(self):
ctx = (
({'Vlan100': {'dhcp_servers': ['192.0.0.1', '192.168.0.2'], 'dhcpv6_servers': ['fc02:2000::1', 'fc02:2000::2']}}, {}, {}),
({'Vlan100': {'dhcp_servers': ['192.0.0.1', '192.168.0.2']}}, {}, {}),
(),
)
assert show_dhcp_relay.get_dhcp_helper_address(ctx, 'Vlan100') == '192.0.0.1\n192.168.0.2\nfc02:2000::1\nfc02:2000::2'
assert show_dhcp_relay.get_dhcp_helper_address(ctx, 'Vlan100') == '192.0.0.1\n192.168.0.2'


3 changes: 1 addition & 2 deletions dockers/docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ def get_dhcp_helper_address(ctx, vlan):
return ""

dhcp_helpers = vlan_config.get('dhcp_servers', [])
dhcpv6_helpers = vlan_config.get('dhcpv6_servers', [])

return '\n'.join(natsorted(dhcp_helpers) + natsorted(dhcpv6_helpers))
return '\n'.join(natsorted(dhcp_helpers))


vlan.VlanBrief.register_column('DHCP Helper Address', get_dhcp_helper_address)
Expand Down