diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-05-28 17:20:14 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-05-28 17:20:14 +0200 |
| commit | df751f6ed14ef5ab28bb626ef4b554d98d823fc9 (patch) | |
| tree | 7ce6f3756e99147b30719e4d6213d20207913290 | |
| parent | 5b1ac79562bd60494c9ec31723b27b0affe7fe5c (diff) | |
| download | vyos-1x-df751f6ed14ef5ab28bb626ef4b554d98d823fc9.tar.gz vyos-1x-df751f6ed14ef5ab28bb626ef4b554d98d823fc9.zip | |
dhcpc6-pd: T2506: bugfix config rendering on non PPPoE interfaces
After commit d5b58517f883 ("dhcpv6-pd: pppoe: T2506: restructure CLI") the
CLI syntax has been adjusted for a better definition of DHCPv6-PD prefix length
option. Verifying a properly rendered template indeed did not happen which
cause the function to vanish for non PPPoE interfaces.
| -rw-r--r-- | python/vyos/configdict.py | 6 | ||||
| -rw-r--r-- | python/vyos/ifconfig/interface.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index c89447163..ead7e8637 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -234,9 +234,9 @@ def intf_to_dict(conf, default): # DHCPv6 prefix delegation (RFC3633) current_level = conf.get_level() - if conf.exists(['dhcpv6-options', 'delegate']): - for interface in conf.list_nodes(['dhcpv6-options', 'delegate']): - conf.set_level(current_level + ['dhcpv6-options', 'delegate', interface]) + if conf.exists(['dhcpv6-options', 'prefix-delegation']): + for interface in conf.list_nodes(['dhcpv6-options', 'prefix-delegation', 'interface']): + conf.set_level(current_level + ['dhcpv6-options', 'prefix-delegation', 'interface', interface]) pd = { 'ifname': interface, 'sla_id': '', diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py index 07efc6d97..2c2396440 100644 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -644,7 +644,7 @@ class Interface(Control): IPv4: add IPv4 address to interface IPv6: add IPv6 address to interface dhcp: start dhclient (IPv4) on interface - dhcpv6: start dhclient (IPv6) on interface + dhcpv6: start WIDE DHCPv6 (IPv6) on interface Returns False if address is already assigned and wasn't re-added. Example: |