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

topotests: make 'quagga' check optional

Browse Source 
Only check for quagga directories and binaries when we don't find FRR.
Also fix a copy-paste error in warning message.
This commit is contained in:
Rafael Zalamena 2017-07-20 10:54:38 -03:00 committed by Donald Sharp
parent 45619ee3de
commit 812e38a94d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/topotests/lib/topogen.py
View File

@ -885,10 +885,12 @@ def diagnose_env():
# Assert that FRR utilities exist # Assert that FRR utilities exist
frrdir = config.get('topogen', 'frrdir') frrdir = config.get('topogen', 'frrdir')
hasfrr = False
if not os.path.isdir(frrdir): if not os.path.isdir(frrdir):
logger.error('could not find {} directory'.format(frrdir)) logger.error('could not find {} directory'.format(frrdir))
ret = False ret = False
else: else:
hasfrr = True
try: try:
pwd.getpwnam('frr')[2] pwd.getpwnam('frr')[2]
except KeyError: except KeyError:
@ -920,9 +922,13 @@ def diagnose_env():
# Assert that Quagga utilities exist # Assert that Quagga utilities exist
quaggadir = config.get('topogen', 'quaggadir') quaggadir = config.get('topogen', 'quaggadir')
if not os.path.isdir(quaggadir): if hasfrr:
# if we have frr, don't check for quagga
pass
elif not os.path.isdir(quaggadir):
logger.info('could not find {} directory (quagga tests will not run)'.format(quaggadir)) logger.info('could not find {} directory (quagga tests will not run)'.format(quaggadir))
else: else:
ret = True
try: try:
pwd.getpwnam('quagga')[2] pwd.getpwnam('quagga')[2]
except KeyError: except KeyError:
@ -937,7 +943,7 @@ def diagnose_env():
if 'quagga' not in grp.getgrnam('quaggavty').gr_mem: if 'quagga' not in grp.getgrnam('quaggavty').gr_mem:
logger.error('"quagga" user and group exist, but user is not under "quaggavty"') logger.error('"quagga" user and group exist, but user is not under "quaggavty"')
except KeyError: except KeyError:
logger.warning('could not find "frrvty" group') logger.warning('could not find "quaggavty" group')
for fname in ['zebra', 'ospfd', 'ospf6d', 'bgpd', 'ripd', 'ripngd', for fname in ['zebra', 'ospfd', 'ospf6d', 'bgpd', 'ripd', 'ripngd',
'isisd', 'pimd']: 'isisd', 'pimd']: