summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJernej Jakob <jernej.jakob@gmail.com>2020-05-01 18:49:57 +0200
committerJernej Jakob <jernej.jakob@gmail.com>2020-05-04 22:59:39 +0200
commitea6fd38d526f95a4e8524dfb3fc3ccc4460276e0 (patch)
tree098b47840634f42190493eec3bf71110431a4cec
parentc63ee72e797d29a756c413174ada98d301631bac (diff)
downloadvyos-1x-ea6fd38d526f95a4e8524dfb3fc3ccc4460276e0.tar.gz
vyos-1x-ea6fd38d526f95a4e8524dfb3fc3ccc4460276e0.zip
l2tpv3: 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 in case it is deleted and recreated
-rwxr-xr-xsrc/conf_mode/interfaces-l2tpv3.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/conf_mode/interfaces-l2tpv3.py b/src/conf_mode/interfaces-l2tpv3.py
index 90a7ecdc8..fe5de3431 100755
--- a/src/conf_mode/interfaces-l2tpv3.py
+++ b/src/conf_mode/interfaces-l2tpv3.py
@@ -264,6 +264,10 @@ def apply(l2tpv3):
if not l2tpv3['disable']:
l.set_admin_state('up')
+ # re-add ourselves to any bridge we might have fallen out of
+ if l2tpv3['is_bridge_member']:
+ l.add_to_bridge(l2tpv3['is_bridge_member'])
+
return None
if __name__ == '__main__':