From: Martin Winter <mwinter@opensourcerouting.org>
Date: Wed, 26 Jul 2017 23:22:14 +0000 (-0700)
Subject: lib: Enhance daemon_available() function to check for mpls modules in case of LDPd
X-Git-Tag: frr-7.1-dev~151^2~242
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b431b5540fb1a6d3b067b3678f567e76bcdf775c;p=matthieu%2Ffrr.git

lib: Enhance daemon_available() function to check for mpls modules in case of LDPd

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index f4aa508bf2..cabcc9a753 100644
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -687,13 +687,13 @@ class Router(Node):
         if not os.path.isfile(daemon_path):
             return False
         if (daemon == 'ldpd'):
-            kernel_version = re.search(r'([0-9]+)\.([0-9]+).*', platform.release())
-            if kernel_version:
-                if (float(kernel_version.group(1)) < 4 or
-                   (float(kernel_version.group(1)) == 4 and float(kernel_version.group(2)) < 5)):
-                    return False
-            else:
+            if version_cmp(platform.release(), '4.5') < 0:
+                return False
+            if self.cmd('/sbin/modprobe -n mpls-router' ) != "":
                 return False
+            if self.cmd('/sbin/modprobe -n mpls-iptunnel') != "":
+                return False
+
         return True
     def get_routertype(self):
         "Return the type of Router (frr or quagga)"