From 65c485175b8d3b02a37f2414a329f2364c8f1321 Mon Sep 17 00:00:00 2001 From: roopa Date: Fri, 2 May 2014 08:10:59 -0700 Subject: [PATCH] include only interfaces with no config in the upperiface check Ticket: CM-1438 Reviewed By: Testing Done: sanity and ifdown on bridges with vlans that dont have user config --- pkg/scheduler.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/scheduler.py b/pkg/scheduler.py index 663aa70..824e820 100644 --- a/pkg/scheduler.py +++ b/pkg/scheduler.py @@ -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 -- 2.39.5