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-07 20:03:23 -07:00
parent ff3b214165 d5c0f70366
commit a2ffd24f27
4 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
addons/vrf.py
View File

@@ -687,17 +687,24 @@ class vrf(moduleBase):
if vrf_table == 'auto':
vrf_table = self._get_iproute2_vrf_table(ifaceobj.name)
try:
running_slaves = self.ipcmd.link_get_lowers(ifaceobj.name)
if running_slaves:
for s in running_slaves:
if ifaceobj_getfunc:
sobj = ifaceobj_getfunc(s)
self._handle_existing_connections(sobj[0] if sobj else None,
running_slaves = self.ipcmd.link_get_lowers(ifaceobj.name)
if running_slaves:
for s in running_slaves:
if ifaceobj_getfunc:
sobj = ifaceobj_getfunc(s)
try:
self._handle_existing_connections(sobj[0]
if sobj else None,
ifaceobj.name)
except Exception, e:
self.logger.info('%s: %s' %(ifaceobj.name, str(e)))
pass
except Exception, e:
self.logger.info('%s: %s' %(ifaceobj.name, str(e)))
pass
try:
self.ipcmd.addr_flush(s)
rtnetlink_api.rtnl_api.link_set(s, "down")
except Exception, e:
self.logger.info('%s: %s' %(ifaceobj.name, str(e)))
pass
self._down_vrf_helper(ifaceobj, vrf_table)