From 9b8e3d83e9cf106e2203300e1d5b940f839c9827 Mon Sep 17 00:00:00 2001 From: JACK Date: Sat, 21 Nov 2020 16:25:08 +0800 Subject: bridge: T3079: bugfix on VLAN 1 is deleted in VLAN-aware bridges --- python/vyos/ifconfig/bridge.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/python/vyos/ifconfig/bridge.py b/python/vyos/ifconfig/bridge.py index e6cda4adb..1ecc2dd76 100644 --- a/python/vyos/ifconfig/bridge.py +++ b/python/vyos/ifconfig/bridge.py @@ -318,15 +318,19 @@ class BridgeIf(Interface): if 'allowed_vlan' in interface_config: vlan_filter = 1 - for vlan in interface_config['allowed_vlan']: - cmd = f'bridge vlan add dev {interface} vid {vlan} master' - self._cmd(cmd) - vlan_add.add(vlan) if vlan_filter: if 'native_vlan' not in interface_config: cmd = f'bridge vlan del dev {interface} vid 1' self._cmd(cmd) + + if 'allowed_vlan' in interface_config: + for vlan in interface_config['allowed_vlan']: + cmd = f'bridge vlan add dev {interface} vid {vlan} master' + self._cmd(cmd) + vlan_add.add(vlan) + + for vlan in vlan_del: -- cgit v1.2.3