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: bridge-access checks are not necessary for single vxlan devices

Browse Source 
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2021-03-18 16:10:18 +01:00
parent f54c45deb9
commit d38e9b1273
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ifupdown2/addons/bridge.py
View File

@@ -919,9 +919,12 @@ class bridge(Bridge, moduleBase):
return True
def _error_vxlan_in_vlan_aware_br(self, ifaceobj, bridgename):
self.log_error('`bridge-access` attribute is mandatory when vxlan '
'device (%s) is part of vlan aware bridge (%s)'
% (ifaceobj.name, bridgename), ifaceobj)
if not ifaceobj.link_privflags & ifaceLinkPrivFlags.SINGLE_VXLAN:
self.log_error('`bridge-access` attribute is mandatory when vxlan '
'device (%s) is part of vlan aware bridge (%s)'
% (ifaceobj.name, bridgename), ifaceobj)
return False
return True
def syntax_check_vxlan_in_vlan_aware_br(self, ifaceobj, ifaceobj_getfunc):
if not ifaceobj_getfunc:
@@ -943,9 +946,8 @@ class bridge(Bridge, moduleBase):
or not self._compare_vids(bridge_vids,
vids,
pvid=pvid)):
self._error_vxlan_in_vlan_aware_br(ifaceobj,
ifaceobj_upper.name)
return False
if not self._error_vxlan_in_vlan_aware_br(ifaceobj, ifaceobj_upper.name):
return False
return True
@staticmethod