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

Moved warning to info level

Browse Source 
Ticket: CM-4622
Reviewed By:
Testing Done: Tested ifup/ifdown on a bridge

If the file is not present, we will just log it.
This commit is contained in:
Roopa Prabhu
2014-12-31 23:47:18 -08:00
parent 00f6105d9f
commit a8f0880820
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
addons/bridge.py
View File

@@ -282,7 +282,7 @@ class bridge(moduleBase):
self.write_file('/proc/sys/net/ipv6/conf/%s' %p + self.write_file('/proc/sys/net/ipv6/conf/%s' %p +
'/disable_ipv6', enable) '/disable_ipv6', enable)
except Exception, e: except Exception, e:
self.logger.warn(str(e)) self.logger.info(str(e))
pass pass
def _add_ports(self, ifaceobj): def _add_ports(self, ifaceobj):
@@ -326,7 +326,7 @@ class bridge(moduleBase):
pass pass
# enable ipv6 for ports that were removed # enable ipv6 for ports that were removed
self._ports_enable_disable_ipv6(removedbridgeports, '1') self._ports_enable_disable_ipv6(removedbridgeports, '0')
if err: if err:
self.log_error('bridge configuration failed (missing ports)') self.log_error('bridge configuration failed (missing ports)')
@@ -844,7 +844,7 @@ class bridge(moduleBase):
if not running_ports: if not running_ports:
return return
# disable ipv6 for ports that were added to bridge # disable ipv6 for ports that were added to bridge
self._ports_enable_disable_ipv6(running_ports, '0') self._ports_enable_disable_ipv6(running_ports, '1')
self._apply_bridge_port_settings_all(ifaceobj, self._apply_bridge_port_settings_all(ifaceobj,
ifaceobj_getfunc=ifaceobj_getfunc) ifaceobj_getfunc=ifaceobj_getfunc)
except Exception, e: except Exception, e:
@@ -867,12 +867,10 @@ class bridge(moduleBase):
ports = self.brctlcmd.get_bridge_ports(ifaceobj.name) ports = self.brctlcmd.get_bridge_ports(ifaceobj.name)
self.brctlcmd.delete_bridge(ifaceobj.name) self.brctlcmd.delete_bridge(ifaceobj.name)
if ports: if ports:
for p in ports: self._ports_enable_disable_ipv6(ports, '0')
proc_file = ('/proc/sys/net/ipv6/conf/%s' %p +
'/disable_ipv6')
self.write_file(proc_file, '0')
if ifaceobj.link_type != ifaceLinkType.LINK_NA: if ifaceobj.link_type != ifaceLinkType.LINK_NA:
rtnetlink_api.rtnl_api.link_set(p, "down") map(lambda p: rtnetlink_api.rtnl_api.link_set(p,
"down"), ports)
except Exception, e: except Exception, e:
self.log_error(str(e)) self.log_error(str(e))