proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/frr-reload.py: support -N pathspace

Browse Source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2019-08-08 20:20:33 +02:00
parent 33606a1547
commit a0a7dead0b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/frr-reload.py
View File

@ -63,14 +63,17 @@ class VtyshException(Exception):
pass pass
class Vtysh(object): class Vtysh(object):
def __init__(self, bindir=None, confdir=None, sockdir=None): def __init__(self, bindir=None, confdir=None, sockdir=None, pathspace=None):
self.bindir = bindir self.bindir = bindir
self.confdir = confdir self.confdir = confdir
self.pathspace = pathspace
self.common_args = [os.path.join(bindir or '', 'vtysh')] self.common_args = [os.path.join(bindir or '', 'vtysh')]
if confdir: if confdir:
self.common_args.extend(['--config_dir', confdir]) self.common_args.extend(['--config_dir', confdir])
if sockdir: if sockdir:
self.common_args.extend(['--vty_socket', sockdir]) self.common_args.extend(['--vty_socket', sockdir])
if pathspace:
self.common_args.extend(['-N', pathspace])
def _call(self, args, stdin=None, stdout=None, stderr=None): def _call(self, args, stdin=None, stdout=None, stderr=None):
kwargs = {} kwargs = {}
@ -1171,6 +1174,7 @@ if __name__ == '__main__':
group.add_argument('--test', action='store_true', help='Show 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) parser.add_argument('--debug', action='store_true', help='Enable debugs', default=False)
parser.add_argument('--stdout', action='store_true', help='Log to STDOUT', default=False) 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('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('--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') parser.add_argument('--bindir', help='path to the vtysh executable', default='/usr/bin')
@ -1246,10 +1250,13 @@ if __name__ == '__main__':
log.error(msg) log.error(msg)
sys.exit(1) 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 # 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 service_integrated_vtysh_config = True
if os.path.isfile(vtysh_filename): if os.path.isfile(vtysh_filename):