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

tools/frr-reload: --vty_socket arg

Browse Source 
After the cleanup, adding this doesn't require updating a zillion
locations in the code anymore, just one :)

Partially derived from 6a00e91d99f7f98d857c2056d0dcfeba48966581

Originally-by: Emanuele Di Pascale <emanuele@voltanet.io>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2020-05-26 19:12:24 +02:00
parent 663ece2f6d
commit fa18c6bbda
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/frr-reload.py
View File

@ -63,12 +63,14 @@ class VtyshException(Exception):
pass pass
class Vtysh(object): class Vtysh(object):
def __init__(self, bindir=None, confdir=None): def __init__(self, bindir=None, confdir=None, sockdir=None):
self.bindir = bindir self.bindir = bindir
self.confdir = confdir self.confdir = confdir
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:
self.common_args.extend(['--vty_socket', sockdir])
def _call(self, args, stdin=None, stdout=None, stderr=None): def _call(self, args, stdin=None, stdout=None, stderr=None):
kwargs = {} kwargs = {}
@ -1171,6 +1173,7 @@ if __name__ == '__main__':
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')
parser.add_argument('--confdir', help='path to the daemon config files', default='/etc/frr') parser.add_argument('--confdir', help='path to the daemon config files', default='/etc/frr')
parser.add_argument('--rundir', help='path for the temp config file', default='/var/run/frr') parser.add_argument('--rundir', help='path for the temp config file', default='/var/run/frr')
parser.add_argument('--vty_socket', help='socket to be used by vtysh to connect to the daemons', default=None)
parser.add_argument('--daemon', help='daemon for which want to replace the config', default='') parser.add_argument('--daemon', help='daemon for which want to replace the config', default='')
args = parser.parse_args() args = parser.parse_args()
@ -1226,6 +1229,13 @@ if __name__ == '__main__':
log.error(msg) log.error(msg)
sys.exit(1) sys.exit(1)
# verify that the vty_socket, if specified, is valid
if args.vty_socket and not os.path.isdir(args.vty_socket):
msg = 'vty_socket %s is not a valid path' % args.vty_socket
print(msg)
log.error(msg)
sys.exit(1)
# verify that the daemon, if specified, is valid # 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']: 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 msg = "Daemon %s is not a valid option for 'show running-config'" % args.daemon
@ -1233,7 +1243,7 @@ if __name__ == '__main__':
log.error(msg) log.error(msg)
sys.exit(1) sys.exit(1)
vtysh = Vtysh(args.bindir, args.confdir) vtysh = Vtysh(args.bindir, args.confdir, args.vty_socket)
# Verify that 'service integrated-vtysh-config' is configured # Verify that 'service integrated-vtysh-config' is configured
vtysh_filename = args.confdir + '/vtysh.conf' vtysh_filename = args.confdir + '/vtysh.conf'