matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dhcp_relay] Remove dhcpv6 servers from VlanBrief (#9718)

Browse Source
This commit is contained in:
kellyyeh 2022-01-19 07:47:08 -08:00 committed by GitHub
parent 4ae504a813
commit 3e263fa6a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockers/docker-dhcp-relay/cli-plugin-tests/test_show_dhcp_relay.py
View File

@ -20,9 +20,9 @@ class TestVlanDhcpRelay(object):
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
dockers/docker-dhcp-relay/cli/show/plugins/show_dhcp_relay.py
View File

@ -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)