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

remove blacklisted interfaces only if they are upperifaces (ie root of

Browse Source 
the tree)

Ticket: CM-7765
Reviewed By: CCR-3621
Testing Done: tested interface dependencies with auto and non-auto
interfaces

This commit fixes a change in behaviour introduced by "460906d0552d" ("skip adding
filtered or blacklisted interfaces in the dependency graph") that
skipped non-auto (or blacklisted) interfaces.

Turns out we have files out there that do have non-auto
dependents. This patch makes sure blacklisted interfaces who are
dependents of other interfaces are always picked up.
This commit is contained in:
Roopa Prabhu
2015-10-02 13:18:03 -07:00
parent a33e94f72b
commit 67cfaeb1cf
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/bridge.py
View File

@@ -630,7 +630,7 @@ class bridge(moduleBase):
self.brctlcmd.set_bridgeport_attrs(ifaceobj.name, port,
attrdict)
except Exception, e:
self.log_warn('%s: %s', str(e))
self.log_warn('%s: %s' %(ifaceobj.name, str(e)))
pass
self._set_bridge_vidinfo_compat(ifaceobj)
self._set_bridge_mcqv4src_compat(ifaceobj)