wirelessmodem: T2241: fix falling out of bridge when changing settings

Previously, the interface was always deleted and recreated, which
removed it from the bridge.
- always re-add the interface back to any bridge it is part of

1 files changed, 7 insertions, 0 deletions

diff --git a/src/conf_mode/interfaces-wirelessmodem.py b/src/conf_mode/interfaces-wirelessmodem.py
index 313d19470..cf2945593 100755
--- a/src/conf_mode/interfaces-wirelessmodem.py
+++ b/src/conf_mode/interfaces-wirelessmodem.py
@@ -21,6 +21,7 @@ from copy import deepcopy
 from netifaces import interfaces
 
 from vyos.config import Config
+from vyos.ifconfig import BridgeIf, Section
 from vyos.template import render
 from vyos.util import chown, chmod_755, cmd, call
 from vyos.validate import is_member
@@ -205,6 +206,12 @@ def apply(wwan):
         # make logfile owned by root / vyattacfg
         chown(wwan['logfile'], 'root', 'vyattacfg')
 
+        # re-add ourselves to any bridge we might have fallen out of
+        # FIXME: wwan isn't under vyos.ifconfig so we can't call
+        # Interfaces.add_to_bridge() so STP settings won't get applied
+        if wwan['is_bridge_member'] in Section.interfaces('bridge'):
+            BridgeIf(wwan['is_bridge_member'], create=False).add_port(wwan['intf'])
+
     return None
 
 if __name__ == '__main__':