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

Merge branch 'dev' into release/cl-stable

Browse Source
This commit is contained in:
Roopa Prabhu
2016-05-10 09:50:55 -07:00
parent c4ecd1d877 77021aa1ce
commit 8c9efa85dc
2 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
addons/address.py
View File

@@ -166,7 +166,26 @@ class address(moduleBase):
newaddr_attrs[newaddr]= attrs
return (True, newaddrs, newaddr_attrs)
def _inet_address_config(self, ifaceobj, ifaceobj_getfunc=None):
def _inet_address_list_config(self, ifaceobj, newaddrs, newaddr_attrs):
for addr_index in range(0, len(newaddrs)):
try:
if newaddr_attrs:
self.ipcmd.addr_add(ifaceobj.name, newaddrs[addr_index],
newaddr_attrs.get(newaddrs[addr_index],
{}).get('broadcast'),
newaddr_attrs.get(newaddrs[addr_index],
{}).get('pointopoint'),
newaddr_attrs.get(newaddrs[addr_index],
{}).get('scope'),
newaddr_attrs.get(newaddrs[addr_index],
{}).get('preferred-lifetime'))
else:
self.ipcmd.addr_add(ifaceobj.name, newaddrs[addr_index])
except Exception, e:
self.log_error(str(e))
def _inet_address_config(self, ifaceobj, ifaceobj_getfunc=None,
force_reapply=False):
squash_addr_config = (True if \
ifupdownConfig.config.get('addr_config_squash', \
'0') == '1' else False)
@@ -207,6 +226,8 @@ class address(moduleBase):
if runningaddrs and anycast_addr and anycast_addr in runningaddrs:
newaddrs.append(anycast_addr)
if newaddrs == runningaddrs:
if force_reapply:
self._inet_address_list_config(ifaceobj, newaddrs, newaddr_attrs)
return
try:
# if primary address is not same, there is no need to keep any.
@@ -220,27 +241,13 @@ class address(moduleBase):
self.log_warn(str(e))
if not newaddrs:
return
for addr_index in range(0, len(newaddrs)):
try:
if newaddr_attrs:
self.ipcmd.addr_add(ifaceobj.name, newaddrs[addr_index],
newaddr_attrs.get(newaddrs[addr_index],
{}).get('broadcast'),
newaddr_attrs.get(newaddrs[addr_index],
{}).get('pointopoint'),
newaddr_attrs.get(newaddrs[addr_index],
{}).get('scope'),
newaddr_attrs.get(newaddrs[addr_index],
{}).get('preferred-lifetime'))
else:
self.ipcmd.addr_add(ifaceobj.name, newaddrs[addr_index])
except Exception, e:
self.log_error(str(e))
self._inet_address_list_config(ifaceobj, newaddrs, newaddr_attrs)
def _up(self, ifaceobj, ifaceobj_getfunc=None):
if not self.ipcmd.link_exists(ifaceobj.name):
return
addr_method = ifaceobj.addr_method
force_reapply = False
try:
# release any stale dhcp addresses if present
if (addr_method != "dhcp" and not ifupdownflags.flags.PERFMODE and
@@ -249,17 +256,20 @@ class address(moduleBase):
# any sibling iface objects, kill any stale dhclient
# processes
dhclientcmd = dhclient()
if dhclient.is_running(ifaceobj.name):
if dhclientcmd.is_running(ifaceobj.name):
# release any dhcp leases
dhclientcmd.release(ifaceobj.name)
elif dhclient.is_running6(ifaceobj.name):
force_reapply = True
elif dhclientcmd.is_running6(ifaceobj.name):
dhclientcmd.release6(ifaceobj.name)
force_reapply = True
except:
pass
self.ipcmd.batch_start()
if addr_method != "dhcp":
self._inet_address_config(ifaceobj, ifaceobj_getfunc)
self._inet_address_config(ifaceobj, ifaceobj_getfunc,
force_reapply)
mtu = ifaceobj.get_attr_value_first('mtu')
if mtu:
self.ipcmd.link_set(ifaceobj.name, 'mtu', mtu)

4
addons/mstpctl.py
View File

@@ -24,7 +24,9 @@ class mstpctl(moduleBase):
'attrs' : {
'mstpctl-ports' :
{'help' : 'mstp ports',
'compat' : True},
'compat' : True,
'deprecated': True,
'new-attribute': 'bridge-ports'},
'mstpctl-stp' :
{'help': 'bridge stp yes/no',
'compat' : True,