From: Martin Winter <mwinter@opensourcerouting.org>
Date: Sun, 20 Aug 2017 06:37:17 +0000 (-0700)
Subject: lib: check for eigrpd available and return warning if missing instead of failing
X-Git-Tag: frr-7.1-dev~151^2~222
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=44a592b2a6b175df6c1c52c862de1b63f9e3d78a;p=mirror%2Ffrr.git

lib: check for eigrpd available and return warning if missing instead of failing
---

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 2eee0f0d3f..2020e43874 100644
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -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 ""