lib: Fix version check in previous kernel compare

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

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 2fed37f86e16f9359742699dd1fa7b9258cf4a57..9fe7c2c6174909e5642210886cf4cafddf45ca61 100644 (file)
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -160,8 +160,8 @@ class Router(Node):
             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):
+                if (float(kernel_version.group(1)) < 4 or
+                   (float(kernel_version.group(1)) == 4 and float(kernel.version.group(2)) < 5)):
                     print("LDP Test need Linux Kernel 4.5 minimum")
                     return "LDP Test need Linux Kernel 4.5 minimum"
         # Add mpls modules to kernel if we use LDP
@@ -249,9 +249,10 @@ class Router(Node):
         if not os.path.isfile('/usr/lib/%s/%s' % (self.routertype, daemon)):
             return False
         if (daemon == 'ldpd'):
-            kernel_version = re.search(r'([0-9]+\.[0-9]+).*', platform.release())
+            kernel_version = re.search(r'([0-9]+)\.([0-9]+).*', platform.release())
             if kernel_version:
-                if float(kernel_version.group(1)) < 4.5:
+                if (float(kernel_version.group(1)) < 4 or
+                   (float(kernel_version.group(1)) == 4 and float(kernel.version.group(2)) < 5)):
                     return False
             else:
                 return False