Merge remote-tracking branch 'upstream/current' into current

1 files changed, 11 insertions, 6 deletions

diff --git a/python/vyos/ifconfig/loopback.py b/python/vyos/ifconfig/loopback.py
index 7ebd13b54..c70e1773f 100644
--- a/python/vyos/ifconfig/loopback.py
+++ b/python/vyos/ifconfig/loopback.py
@@ -64,16 +64,21 @@ class LoopbackIf(Interface):
         on any interface. """
 
         addr = config.get('address', [])
-        # XXX workaround for T2636, convert IP address string to a list
-        # with one element
-        if isinstance(addr, str):
-            addr = [addr]
-
         # We must ensure that the loopback addresses are never deleted from the system
         addr += self._persistent_addresses
 
         # Update IP address entry in our dictionary
         config.update({'address' : addr})
 
-        # now call the regular function from within our base class
+        # call base class
         super().update(config)
+
+        # Enable/Disable of an interface must always be done at the end of the
+        # derived class to make use of the ref-counting set_admin_state()
+        # function. We will only enable the interface if 'up' was called as
+        # often as 'down'. This is required by some interface implementations
+        # as certain parameters can only be changed when the interface is
+        # in admin-down state. This ensures the link does not flap during
+        # reconfiguration.
+        state = 'down' if 'disable' in config else 'up'
+        self.set_admin_state(state)