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: set bridge MTU after bridge creation

Browse Source 
addons: bridge: get bridge MTU from address policy not bridge

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2020-03-26 00:51:25 +01:00
parent 24931ffa21
commit 24084976f7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ifupdown2/addons/bridge.py
View File

@ -2283,18 +2283,18 @@ class bridge(Addon, moduleBase):
if not user_config_mtu: if not user_config_mtu:
user_config_mtu = policymanager.policymanager_api.get_attr_default( user_config_mtu = policymanager.policymanager_api.get_attr_default(
module_name=self.__class__.__name__, module_name="address",
attr="mtu" attr="mtu"
) )
try: try:
if user_config_mtu: if user_config_mtu:
mtu = int(user_config_mtu) int(user_config_mtu)
self.logger.info("%s: set bridge mtu %s" % (ifaceobj.name, mtu)) self.logger.info("%s: set bridge mtu %s" % (ifaceobj.name, user_config_mtu))
return mtu return user_config_mtu
except Exception as e: except Exception as e:
self.logger.warning("%s: invalid bridge mtu %s: %s" % (ifaceobj.name, user_config_mtu, str(e))) self.logger.warning("%s: invalid bridge mtu %s: %s" % (ifaceobj.name, user_config_mtu, str(e)))
return 0 return None
def up_bridge(self, ifaceobj, ifaceobj_getfunc): def up_bridge(self, ifaceobj, ifaceobj_getfunc):
ifname = ifaceobj.name ifname = ifaceobj.name
@ -2305,8 +2305,12 @@ class bridge(Addon, moduleBase):
link_exists = self.cache.link_exists(ifaceobj.name) link_exists = self.cache.link_exists(ifaceobj.name)
if not link_exists: if not link_exists:
self.netlink.link_add_bridge(ifname, mtu=self.get_bridge_mtu(ifaceobj)) self.netlink.link_add_bridge(ifname)
link_just_created = True link_just_created = True
bridge_mtu = self.get_bridge_mtu(ifaceobj)
if bridge_mtu:
self.sysfs.link_set_mtu(ifname, bridge_mtu, int(bridge_mtu))
else: else:
link_just_created = False link_just_created = False
self.logger.info('%s: bridge already exists' % ifname) self.logger.info('%s: bridge already exists' % ifname)