summaryrefslogtreecommitdiff
path: root/python/vyos/ifconfig_vlan.py
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-05-26 20:54:07 +0200
committerChristian Poessinger <christian@poessinger.com>2020-05-26 20:54:07 +0200
commit825059e83237dd389d461257e1b46625084702df (patch)
tree47d50cde1195279ab5b6367b84ff60568620262a /python/vyos/ifconfig_vlan.py
parent62fd70e83c2f147f84f8fb3def5b384d4f56695d (diff)
parent8ff6d2ed6025fb113a180e3c23be83dac7169658 (diff)
downloadvyos-1x-825059e83237dd389d461257e1b46625084702df.tar.gz
vyos-1x-825059e83237dd389d461257e1b46625084702df.zip
Merge branch 'dhcpv6-pd-t2506' of github.com:c-po/vyos-1x into current
* 'dhcpv6-pd-t2506' of github.com:c-po/vyos-1x: dhcpv6-pd: T2506: use common dictionary definition for config parameters dhcpv6-pd: T2506: add option to request specific prefix length dhcpv6-pd: pppoe: T2506: restructure CLI
Diffstat (limited to 'python/vyos/ifconfig_vlan.py')
-rw-r--r--python/vyos/ifconfig_vlan.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/python/vyos/ifconfig_vlan.py b/python/vyos/ifconfig_vlan.py
index a53136ebf..53a77c651 100644
--- a/python/vyos/ifconfig_vlan.py
+++ b/python/vyos/ifconfig_vlan.py
@@ -87,8 +87,11 @@ def apply_vlan_config(vlan, config):
if config['dhcpv6_temporary']:
vlan.dhcp.v6.options['dhcpv6_temporary'] = True
- if config['dhcpv6_pd']:
- vlan.dhcp.v6.options['dhcpv6_pd'] = config['dhcpv6_pd']
+ if config['dhcpv6_pd_length']:
+ vlan.dhcp.v6.options['dhcpv6_pd_length'] = config['dhcpv6_pd_length']
+
+ if config['dhcpv6_pd_interfaces']:
+ vlan.dhcp.v6.options['dhcpv6_pd_interfaces'] = config['dhcpv6_pd_interfaces']
# update interface description used e.g. within SNMP
vlan.set_alias(config['description'])