proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-03 19:04:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Fix version check in previous kernel compare

Browse Source 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2017-04-26 13:22:34 -07:00 committed by Donald Sharp
parent dd43120e8e
commit c63b6f86f0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/topotests/lib/topotest.py
View File

@ -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