From 28440fd9f89f221878960c6143c87912619041d4 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sun, 16 Dec 2018 20:41:58 -0500 Subject: [PATCH 1/2] topotests: module_present should return a True/False The recent change to module_present accidently didn't return anything. Signed-off-by: Donald Sharp --- tests/topotests/lib/topotest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index 6d3e512a4d..d0346c1dd1 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -357,9 +357,9 @@ def module_present_freebsd(module, load): def module_present(module, load=True): if sys.platform.startswith("linux"): - module_present_linux(module, load) + return module_present_linux(module, load) elif sys.platform.startswith("freebsd"): - module_present_freebsd(module, load) + return module_present_freebsd(module, load) def version_cmp(v1, v2): """ From 849d1ed9afb2ccec291137404e61e43b7a2a4cda Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sun, 16 Dec 2018 20:46:10 -0500 Subject: [PATCH 2/2] topotests: Allow sharpd to be used in topotests The sharp daemon did not have any ability to be used in topotests. Add some code to allow this. Signed-off-by: Donald Sharp --- tests/topotests/lib/topotest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index d0346c1dd1..c7f405fac2 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -631,7 +631,7 @@ class Router(Node): self.daemons = {'zebra': 0, 'ripd': 0, 'ripngd': 0, 'ospfd': 0, 'ospf6d': 0, 'isisd': 0, 'bgpd': 0, 'pimd': 0, 'ldpd': 0, 'eigrpd': 0, 'nhrpd': 0, 'staticd': 0, - 'bfdd': 0} + 'bfdd': 0, 'sharpd': 0} self.daemons_options = {'zebra': ''} self.reportCores = True self.version = None