Merge pull request #6738 from deastoe/frr-reload-log-level

tools: frr-reload: more detailed log level control

diff --cc tools/frr-reload.py
index 05410e3c253ecee3820b6fdee5674ac0d67a9f3d,25922e3bf742b609e82c2762c93c51bd226fcabe..a72e5c2772d0ba608b9fb96be840df65115a87ad
--- 1/tools/frr-reload.py
--- 2/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@@ -1203,9 -1168,12 +1202,13 @@@ if __name__ == '__main__'
      group = parser.add_mutually_exclusive_group(required=True)
      group.add_argument('--reload', action='store_true', help='Apply the deltas', default=False)
      group.add_argument('--test', action='store_true', help='Show the deltas', default=False)
-     parser.add_argument('--debug', action='store_true', help='Enable debugs', default=False)
+     level_group = parser.add_mutually_exclusive_group()
+     level_group.add_argument('--debug', action='store_true',
+                              help='Enable debugs (synonym for --log-level=debug)', default=False)
+     level_group.add_argument('--log-level', help='Log level', default="info",
+                              choices=("critical", "error", "warning", "info", "debug"))
      parser.add_argument('--stdout', action='store_true', help='Log to STDOUT', default=False)
 +    parser.add_argument('--pathspace', '-N', metavar='NAME', help='Reload specified path/namespace', default=None)
      parser.add_argument('filename', help='Location of new frr config file')
      parser.add_argument('--overwrite', action='store_true', help='Overwrite frr.conf with running config output', default=False)
      parser.add_argument('--bindir', help='path to the vtysh executable', default='/usr/bin')
@@@ -1276,18 -1248,13 +1283,16 @@@
  
      # verify that the daemon, if specified, is valid
      if args.daemon and args.daemon not in ['zebra', 'bgpd', 'fabricd', 'isisd', 'ospf6d', 'ospfd', 'pbrd', 'pimd', 'ripd', 'ripngd', 'sharpd', 'staticd', 'vrrpd', 'ldpd']:
-         msg = "Daemon %s is not a valid option for 'show running-config'" % args.daemon
-         print(msg)
-         log.error(msg)
+         log.error("Daemon %s is not a valid option for 'show running-config'" % args.daemon)
          sys.exit(1)
  
 -    vtysh = Vtysh(args.bindir, args.confdir, args.vty_socket)
 +    vtysh = Vtysh(args.bindir, args.confdir, args.vty_socket, args.pathspace)
  
      # Verify that 'service integrated-vtysh-config' is configured
 -    vtysh_filename = args.confdir + '/vtysh.conf'
 +    if args.pathspace:
 +        vtysh_filename = args.confdir + '/' + args.pathspace + '/vtysh.conf'
 +    else:
 +        vtysh_filename = args.confdir + '/vtysh.conf'
      service_integrated_vtysh_config = True
  
      if os.path.isfile(vtysh_filename):