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

include only interfaces with no config in the upperiface check

Browse Source 
Ticket: CM-1438
Reviewed By:
Testing Done: sanity and ifdown on bridges with vlans that dont have
user config
This commit is contained in:
roopa
2014-05-02 08:10:59 -07:00
parent 99b212b016
commit 65c485175b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/scheduler.py
View File

@@ -134,8 +134,11 @@ class ifaceScheduler():
Returns True or False indicating the caller to proceed with the
operation.
"""
if ifupdownobj.FORCE:
if (ifupdownobj.FORCE or
not ifupdownobj.ADDONS_ENABLE or
not ifupdownobj.is_ifaceobj_noconfig(ifaceobj)):
return True
# proceed only for down operation
if 'down' not in ops[0]:
return True
@@ -153,9 +156,8 @@ class ifaceScheduler():
for u in tmpulist:
if ifupdownobj.link_exists(u):
if not ifupdownobj.ALL:
ifupdownobj.logger.info('%s: skip interface down,'
%ifaceobj.name + ' upperiface %s still around ' %u +
'(use --force to override)')
ifupdownobj.logger.info('%s: skipping interface down,'
%ifaceobj.name + ' upperiface %s still around ' %u)
return False
return True