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

Merge pull request #3494 from donaldsharp/topotests_fixup

Browse Source 
Topotests fixup
This commit is contained in:
Christian Franke 2018-12-17 10:35:29 +01:00 committed by GitHub
commit 77b5231435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,9 +357,9 @@ def module_present_freebsd(module, load):
def module_present(module, load=True): def module_present(module, load=True):
if sys.platform.startswith("linux"): if sys.platform.startswith("linux"):
module_present_linux(module, load) return module_present_linux(module, load)
elif sys.platform.startswith("freebsd"): elif sys.platform.startswith("freebsd"):
module_present_freebsd(module, load) return module_present_freebsd(module, load)
def version_cmp(v1, v2): def version_cmp(v1, v2):
""" """
@ -631,7 +631,7 @@ class Router(Node):
self.daemons = {'zebra': 0, 'ripd': 0, 'ripngd': 0, 'ospfd': 0, self.daemons = {'zebra': 0, 'ripd': 0, 'ripngd': 0, 'ospfd': 0,
'ospf6d': 0, 'isisd': 0, 'bgpd': 0, 'pimd': 0, 'ospf6d': 0, 'isisd': 0, 'bgpd': 0, 'pimd': 0,
'ldpd': 0, 'eigrpd': 0, 'nhrpd': 0, 'staticd': 0, 'ldpd': 0, 'eigrpd': 0, 'nhrpd': 0, 'staticd': 0,
'bfdd': 0} 'bfdd': 0, 'sharpd': 0}
self.daemons_options = {'zebra': ''} self.daemons_options = {'zebra': ''}
self.reportCores = True self.reportCores = True
self.version = None self.version = None