diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-11-13 12:31:46 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-13 12:31:46 +0700 |
| commit | 35bc7d9d0fc1b3fe2dd87915a65634ef66d7a3b9 (patch) | |
| tree | 415c24e58aaf564ce2cac9522c5ad46384b1bca1 | |
| parent | f9e0fb6bffd41c143ff5454c3b73cca4a588ca86 (diff) | |
| parent | bbfa1efcda80e904188413bf815f2eb428cee0c4 (diff) | |
| download | vyos-1x-35bc7d9d0fc1b3fe2dd87915a65634ef66d7a3b9.tar.gz vyos-1x-35bc7d9d0fc1b3fe2dd87915a65634ef66d7a3b9.zip | |
Merge pull request #601 from jack9603301/T3042
bridge: T3042: Fix VLAN filter invalid work
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 1 | ||||
| -rw-r--r-- | python/vyos/ifconfig/bridge.py | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 678d3806c..778acda78 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -40,6 +40,7 @@ #include <include/interface-disable-link-detect.xml.i> #include <include/interface-disable.xml.i> #include <include/interface-vrf.xml.i> + #include <include/interface-mtu-68-16000.xml.i> <leafNode name="forwarding-delay"> <properties> <help>Forwarding delay</help> diff --git a/python/vyos/ifconfig/bridge.py b/python/vyos/ifconfig/bridge.py index 772db3543..7eac9b886 100644 --- a/python/vyos/ifconfig/bridge.py +++ b/python/vyos/ifconfig/bridge.py @@ -317,6 +317,13 @@ class BridgeIf(Interface): cmd = f'bridge vlan add dev {interface} vid {vlan} master' self._cmd(cmd) + + vif = dict_search('vif', config) + if vif: + for vlan_id,vif_config in vif.items(): + cmd = f'bridge vlan add dev {ifname} vid {vlan_id} self master' + self._cmd(cmd) + # enable/disable Vlan Filter self.set_vlan_filter(vlan_filter) |