addons: address: remove old ip address when intf is moved to dhcp

[mirror_ifupdown2.git] / ifupdown2 / addons / address.py

diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
index f576dc02dc081b44fdbea6a64e105785fa161baa..4746e75049a661879cdca92be9d0c00e2f44a3ca 100644 (file)
--- a/ifupdown2/addons/address.py
+++ b/ifupdown2/addons/address.py
@@ -856,6 +856,12 @@ class address(moduleBase):
         if addr_method not in ["dhcp", "ppp"]:
             self._inet_address_config(ifaceobj, ifaceobj_getfunc,
                                       force_reapply)
+        else:
+            # remove old addresses added by ifupdown2
+            # (if intf was moved from static config to dhcp)
+            for old_ifaceobj in statemanager.statemanager_api.get_ifaceobjs(ifaceobj.name) or []:
+                for addr in old_ifaceobj.get_attr_value("address") or []:
+                    self.ipcmd.addr_del(ifaceobj.name, addr)
 
         self.process_mtu(ifaceobj, ifaceobj_getfunc)