Merge branch 'dhcpv6-pd-cli-adjustment' of github.com:c-po/vyos-1x into current

* 'dhcpv6-pd-cli-adjustment' of github.com:c-po/vyos-1x:
  dhcpv6-pd: T2677: add support for rapid-commit option
  dhcpv6-pd: T2821: support dhcpv6-pd without "address dhcpv6"
  ifconfig: T2653: drop unused vyos.ifconfig.pppoe
  dhcpv6-pd: T2677: optimize CLI interface for PD configuration

1 files changed, 13 insertions, 4 deletions

diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 892495dec..537c4bc2d 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -901,10 +901,15 @@ class Interface(Control):
         if isinstance(new_addr, str):
             new_addr = [new_addr]
 
-        # ensure DHCP/DHCPv6 is stopped (when not configured explicitly)
-        for proto in ['dhcp', 'dhcpv6']:
-            if proto not in new_addr:
-                self.del_addr(proto)
+        # always ensure DHCP client is stopped (when not configured explicitly)
+        if 'dhcp' not in new_addr:
+            self.del_addr('dhcp')
+
+        # always ensure DHCPv6 client is stopped (when not configured as client
+        # for IPv6 address or prefix delegation
+        dhcpv6pd = jmespath.search('dhcpv6_options.pd', config)
+        if 'dhcpv6' not in new_addr or dhcpv6pd == None:
+            self.del_addr('dhcpv6')
 
         # determine IP addresses which are assigned to the interface and build a
         # list of addresses which are no longer in the dict so they can be removed
@@ -915,6 +920,10 @@ class Interface(Control):
         for addr in new_addr:
             self.add_addr(addr)
 
+        # start DHCPv6 client when only PD was configured
+        if dhcpv6pd != None:
+            self.set_dhcpv6(True)
+
         # There are some items in the configuration which can only be applied
         # if this instance is not bound to a bridge. This should be checked
         # by the caller but better save then sorry!