]> git.puffer.fish Git - mirror/frr.git/commitdiff
lib: check for eigrpd available and return warning if missing instead of failing
authorMartin Winter <mwinter@opensourcerouting.org>
Sun, 20 Aug 2017 06:37:17 +0000 (23:37 -0700)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 28 Nov 2018 01:22:12 +0000 (20:22 -0500)
tests/topotests/lib/topotest.py

index 2eee0f0d3f47341ee25d8962dcb6a680dd77a5a2..2020e43874c450e98be0b82aa8b30a7ee7182265 100644 (file)
@@ -582,6 +582,13 @@ class Router(Node):
             self.cmd('/sbin/modprobe mpls-router')
             self.cmd('/sbin/modprobe mpls-iptunnel')
             self.cmd('echo 100000 > /proc/sys/net/mpls/platform_labels')
+
+        if self.daemons['eigrpd'] == 1:
+            eigrpd_path = os.path.join(self.daemondir, 'eigrpd')
+            if not os.path.isfile(eigrpd_path):
+                logger.warning("EIGRP Test, but no eigrpd compiled or installed")
+                return "EIGRP Test, but no eigrpd compiled or installed"
+
         # Init done - now restarting daemons
         self.restartRouter()
         return ""