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

addons: bridge: check if bridge mac is already inherited from a port

Browse Source 
Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2020-09-03 15:49:27 +02:00
committed by Julien Fortin
parent ecb7cc1365
commit f54468e32b
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ifupdown2/addons/bridge.py
View File

@ -2625,7 +2625,21 @@ class bridge(Bridge, moduleBase):
elif self.bridge_set_static_mac_from_port:
# no policy was provided, we need to get the first physdev or bond ports
# and use its hwaddress to set the bridge mac
for port in self._get_bridge_port_list_user_ordered(ifaceobj) or []:
# first we need to make sure that the bridge mac is not already inherited from one of it's port
bridge_ports = self._get_bridge_port_list_user_ordered(ifaceobj)
current_mac = self.cache.get_link_address(ifname)
for port in bridge_ports or []:
if not self.is_vxlan(ifaceobj_getfunc(port)):
port_mac = self.cache.get_link_address(port)
if current_mac == port_mac:
self.logger.info("bridge mac is already inherited from %s" % port)
self.bridge_mac_iface = (port, port_mac)
return self.bridge_mac_iface
for port in bridge_ports or []:
# iterate through the bridge-port list
for port_obj in ifaceobj_getfunc(port) or []:
# check if the port is a physdev (link_kind is null) or a bon
@ -2646,6 +2660,15 @@ class bridge(Bridge, moduleBase):
return None, None
@staticmethod
def is_vxlan(port_obj_list):
# checking if the port is a vxlan by checking the ifaceobjs
# instead of checking to cache (saving on locking time)
for _port_obj in port_obj_list or []:
if _port_obj.link_kind == ifaceLinkKind.VXLAN:
return True
return False
def _add_bridge_mac_to_fdb(self, ifaceobj, bridge_mac):
if not ifaceobj.link_privflags & ifaceLinkPrivFlags.BRIDGE_VLAN_AWARE and bridge_mac and ifaceobj.get_attr_value('address'):
self.iproute2.bridge_fdb_add(ifaceobj.name, bridge_mac, vlan=None, bridge=True, remote=None)