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

topojson: use empty vtysh.conf for frr-reload.py

Browse Source 
Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2019-12-02 23:23:16 +01:00
parent 3fa139a65b
commit 2159152d9f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/topotests/lib/common_config.py
View File

@ -28,6 +28,7 @@ from subprocess import PIPE as SUB_PIPE
from subprocess import Popen from subprocess import Popen
from functools import wraps from functools import wraps
from re import search as re_search from re import search as re_search
from tempfile import mkdtemp
import StringIO import StringIO
import os import os
@ -276,11 +277,19 @@ def reset_config_on_routers(tgen, routerName=None):
run_cfg_file = "{}/{}/frr.sav".format(TMPDIR, rname) run_cfg_file = "{}/{}/frr.sav".format(TMPDIR, rname)
init_cfg_file = "{}/{}/frr_json_initial.conf".format(TMPDIR, rname) init_cfg_file = "{}/{}/frr_json_initial.conf".format(TMPDIR, rname)
command = "/usr/lib/frr/frr-reload.py --input {} --test {} > {}". \
format(run_cfg_file, init_cfg_file, dname) tempdir = mkdtemp()
with open(os.path.join(tempdir, 'vtysh.conf'), 'w') as fd:
pass
command = "/usr/lib/frr/frr-reload.py --confdir {} --input {} --test {} > {}". \
format(tempdir, run_cfg_file, init_cfg_file, dname)
result = call(command, shell=True, stderr=SUB_STDOUT, result = call(command, shell=True, stderr=SUB_STDOUT,
stdout=SUB_PIPE) stdout=SUB_PIPE)
os.unlink(os.path.join(tempdir, 'vtysh.conf'))
os.rmdir(tempdir)
# Assert if command fail # Assert if command fail
if result > 0: if result > 0:
logger.error("Delta file creation failed. Command executed %s", logger.error("Delta file creation failed. Command executed %s",