mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

addons: bridge: syntax check for illegal subintf as member of VLAN aware bridge

Browse Source 
Ticket: CM-12906
Reviewed By: Roopa, Nikhil G
Testing Done:

$ ifquery br0
auto br0
iface br0
      bridge-vlan-aware yes
      bridge-ports tap0 tap1.100
      bridge-vids 100 200
      bridge-pvid 1
      bridge-stp on

$ ifreload -a -s
error: br0: tap1.100: vlan sub-interface is not supported in a vlan-aware bridge
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-10-19 00:30:21 +02:00
parent a5bd56f269
commit 8e9fc17804
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mstpctl.py
View File

@@ -226,7 +226,7 @@ class mstpctl(moduleBase):
else:
self.default_vxlan_ports_set_bpduparams = False
def syntax_check(self, ifaceobj):
def syntax_check(self, ifaceobj, ifaceobj_getfunc):
if self._is_bridge(ifaceobj):
if (ifaceobj.link_privflags & ifaceLinkPrivFlags.BRIDGE_VLAN_AWARE
and ifaceobj.get_attr_value_first('mstpctl-portadminedge')):