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

lib: use per node log directory when topotest is used without topogen

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2018-05-21 09:47:18 -04:00 committed by Donald Sharp
parent deb4cef09a
commit da63d5b319
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/topotests/lib/topotest.py
View File

@ -59,6 +59,24 @@ class json_cmp_result(object):
"Returns True if there were errors, otherwise False."
return len(self.errors) > 0
def get_test_logdir(node=None, init=False):
"""
Return the current test log directory based on PYTEST_CURRENT_TEST
environment variable.
Optional paramters:
node: when set, adds the node specific log directory to the init dir
init: when set, initializes the log directory and fixes path permissions
"""
cur_test = os.environ['PYTEST_CURRENT_TEST']
ret = '/tmp/topotests/' + cur_test[0:cur_test.find(".py")].replace('/','.')
if node != None:
dir = ret + "/" + node
if init:
os.system('mkdir -p ' + dir)
os.system('chmod 775 ' + dir)
return ret
def json_diff(d1, d2):
"""
Returns a string with the difference between JSON data.
@ -462,7 +480,7 @@ class Router(Node):
def __init__(self, name, **params):
super(Router, self).__init__(name, **params)
self.logdir = params.get('logdir', '/tmp')
self.logdir = params.get('logdir', get_test_logdir(name, True))
self.daemondir = None
self.hasmpls = False
self.routertype = 'frr'