From cbdde74e166e5658098b154f1d4843c600bd2ab7 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Thu, 12 May 2016 22:11:15 -0700 Subject: [PATCH] ifupdown2: ifreload: enable dry run (--no-act) and other dry run fixes Ticket: CM-10965 Reviewed By: julien Testing Done: Tested dry-run option Signed-off-by: Roopa Prabhu --- addons/vrf.py | 3 +++ sbin/ifupdown2 | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/vrf.py b/addons/vrf.py index 87a2b52..fddbae7 100644 --- a/addons/vrf.py +++ b/addons/vrf.py @@ -620,6 +620,9 @@ class vrf(moduleBase): shell=False).split()[2] self.logger.info("%s: killing active ssh sessions: %s" %(ifacename, str(proc))) + + if ifupdownflags.flags.DRYRUN: + return for id in proc: if id != pid: try: diff --git a/sbin/ifupdown2 b/sbin/ifupdown2 index 140202d..5c38533 100755 --- a/sbin/ifupdown2 +++ b/sbin/ifupdown2 @@ -143,7 +143,8 @@ def run_reload(args): ifupdown_handle = ifupdownMain(config=configmap_g, interfacesfile=interfacesfilename, withdepends=args.withdepends, - perfmode=args.perfmode) + perfmode=args.perfmode, + dryrun=args.noact) ifupdown_handle.reload(['pre-up', 'up', 'post-up'], ['pre-down', 'down', 'post-down'], auto=args.all, allow=args.CLASS, ifacenames=None, @@ -354,7 +355,8 @@ def update_ifreload_argparser(argparser): argparser.add_argument('iflist', metavar='IFACE', nargs='*', help=argparse.SUPPRESS) argparser.add_argument('-n', '--no-act', dest='noact', - action='store_true', help=argparse.SUPPRESS) + action='store_true', help='print out what would happen,' + + 'but don\'t do it') argparser.add_argument('-v', '--verbose', dest='verbose', action='store_true', help='verbose') argparser.add_argument('-d', '--debug', dest='debug',