From a1afabff0fa8be39c917cd2fd879c4b68db49f42 Mon Sep 17 00:00:00 2001
From: Jernej Jakob <jernej.jakob@gmail.com>
Date: Sun, 3 May 2020 11:22:11 +0200
Subject: interface: T2367: optimize flow and detriplicate add/del_addr
 functions

- detriplicate list appending
- detriplicate returns
- use if-elif-else
- move check if address is already added to beginning
- move caching in variable to after address assignment so a failed
  assignment won't cache the address
---
 python/vyos/ifconfig/interface.py | 48 +++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

(limited to 'python/vyos/ifconfig/interface.py')

diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index de5ca369f..5b3da228e 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -638,6 +638,10 @@ class Interface(Control):
         # XXX: normalize/compress with ipaddress if calling functions don't?
         # is subnet mask always passed, and in the same way?
 
+        # do not add same address twice
+        if addr in self._addr:
+            return False
+
         # we can't have both DHCP and static IPv4 addresses assigned
         for a in self._addr:
             if ( ( addr == 'dhcp' and a != 'dhcpv6' and is_ipv4(a) ) or
@@ -646,27 +650,20 @@ class Interface(Control):
                     "Can't configure both static IPv4 and DHCP address "
                     "on the same interface"))
 
-        # do not add same address twice
-        if addr in self._addr:
-            return False
-
         # add to interface
         if addr == 'dhcp':
-            self._addr.append(addr)
             self.dhcp.v4.set()
-            return True
-
-        if addr == 'dhcpv6':
-            self._addr.append(addr)
+        elif addr == 'dhcpv6':
             self.dhcp.v6.set()
-            return True
-
-        if not is_intf_addr_assigned(self.ifname, addr):
-            self._addr.append(addr)
+        elif not is_intf_addr_assigned(self.ifname, addr):
             self._cmd(f'ip addr add "{addr}" dev "{self.ifname}"')
-            return True
+        else:
+            return False
 
-        return False
+        # add to cache
+        self._addr.append(addr)
+
+        return True
 
     def del_addr(self, addr):
         """
@@ -693,24 +690,21 @@ class Interface(Control):
         ['2001:db8::ffff/64']
         """
 
-        # remove from cache (dhcp, and dhcpv6 can not be in it)
-        if addr in self._addr:
-            self._addr.remove(addr)
-
         # remove from interface
         if addr == 'dhcp':
             self.dhcp.v4.delete()
-            return True
-
-        if addr == 'dhcpv6':
+        elif addr == 'dhcpv6':
             self.dhcp.v6.delete()
-            return True
-
-        if is_intf_addr_assigned(self.ifname, addr):
+        elif is_intf_addr_assigned(self.ifname, addr):
             self._cmd(f'ip addr del "{addr}" dev "{self.ifname}"')
-            return True
+        else:
+            return False
+
+        # remove from cache
+        if addr in self._addr:
+            self._addr.remove(addr)
 
-        return False
+        return True
 
     def flush_addrs(self):
         """
-- 
cgit v1.2.3


From e35807b209e3de77b09082a74d2b0f0b1a802206 Mon Sep 17 00:00:00 2001
From: Jernej Jakob <jernej.jakob@gmail.com>
Date: Sun, 3 May 2020 15:47:11 +0200
Subject: interface: T2241: add function to add self to bridge

Will be called by all interface scripts to re-add themselves to a bridge
after deleting and recreating themselves.
---
 python/vyos/ifconfig/interface.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'python/vyos/ifconfig/interface.py')

diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 5b3da228e..7b42e3399 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -42,6 +42,7 @@ from vyos.ifconfig.control import Control
 from vyos.ifconfig.dhcp import DHCP
 from vyos.ifconfig.vrrp import VRRP
 from vyos.ifconfig.operational import Operational
+from vyos.ifconfig import Section
 
 
 class Interface(Control):
@@ -718,3 +719,22 @@ class Interface(Control):
 
         # flush all addresses
         self._cmd(f'ip addr flush dev "{self.ifname}"')
+
+    def add_to_bridge(self, br):
+        """
+        Adds the interface to the bridge with the passed port config.
+
+        Returns False if bridge doesn't exist.
+        """
+
+        # check if the bridge exists (on boot it doesn't)
+        if br not in Section.interfaces('bridge'):
+            return False
+
+        self.flush_addrs()
+        # add interface to bridge - use Section.klass to get BridgeIf class
+        Section.klass(br)(br, create=False).add_port(self.ifname)
+
+        # TODO: port config (STP)
+
+        return True
-- 
cgit v1.2.3