From 45619ee3de61bec4457ac80246994b2c42f89cc2 Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Tue, 18 Jul 2017 16:44:58 -0300 Subject: [PATCH] topotest: simplify ldp kernel check Use version_cmp() instead of hand rolling its own parser. --- tests/topotests/lib/topotest.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index 7872e7087a..fba0407970 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -478,13 +478,10 @@ class Router(Node): if not os.path.isfile(ldpd_path): logger.warning("LDP Test, but no ldpd compiled or installed") return "LDP Test, but no ldpd compiled or installed" - 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)): - logger.warning("LDP Test need Linux Kernel 4.5 minimum") - return "LDP Test need Linux Kernel 4.5 minimum" + if version_cmp(platform.release(), '4.5') < 0: + logger.warning("LDP Test need Linux Kernel 4.5 minimum") + return "LDP Test need Linux Kernel 4.5 minimum" self.cmd('/sbin/modprobe mpls-router') self.cmd('/sbin/modprobe mpls-iptunnel') -- 2.39.5