diff --git a/CHANGELOG.md b/CHANGELOG.md index eee53eb..bb32033 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,14 @@ recorded here; their history is the git log. ## [Unreleased] +## [4.36.2] - 2026-11-12 + +### Fixed +- `kernel_reboot_pending` compares kernel releases the way rpm does (`rpmvercmp`). A + number is newer than letters in the same place, so an Oracle Linux host running + `6.12.0-208.112.5.1.el9uek` no longer asks to reboot into the older + `6.12.0-208.112.5.el9uek`. A `~` (release candidate) comes before its release (#109). + ## [4.36.1] - 2026-11-12 ### Fixed diff --git a/napalm_device_types/host_status.py b/napalm_device_types/host_status.py index 1ba460a..f2bc5be 100644 --- a/napalm_device_types/host_status.py +++ b/napalm_device_types/host_status.py @@ -60,6 +60,7 @@ too full is not decided here. from __future__ import annotations import re +from functools import cmp_to_key from typing import TYPE_CHECKING from napalm_device_types.models import ( @@ -171,9 +172,39 @@ def _sections(output: str) -> dict[str, list[str]]: return sections -def _version_key(version: str) -> tuple[object, ...]: - """Natural order: 6.8.0-142 after 6.8.0-87, 7.0.14 after 7.0.2.""" - return tuple(int(part) if part.isdigit() else part for part in re.split(r"(\d+)", version)) +#: A version's segments as rpm compares them: runs of digits, runs of letters, and +#: ``~``; whatever else stands between them only separates. +_VERSION_SEGMENT = re.compile(r"~|\d+|[A-Za-z]+") + + +def _segment_cmp(x: str, y: str) -> int: + """One segment against another, as :func:`_version_cmp` takes them; 0 when equal.""" + if "~" in (x, y): + return (y == "~") - (x == "~") + if x.isdigit() and y.isdigit(): + return (int(x) > int(y)) - (int(x) < int(y)) + if x.isdigit() or y.isdigit(): + return 1 if x.isdigit() else -1 + return (x > y) - (x < y) + + +def _version_cmp(a: str, b: str) -> int: + """rpm's ``rpmvercmp``: below 0 when ``a`` is older, above when newer. + + Numbers compare as numbers (6.8.0-142 after 6.8.0-87), letters as text, and a + number is newer than letters in its place: ``112.5.1.el9uek`` after + ``112.5.el9uek`` (#109). A version that has more segments where the other + ends is the newer one, unless its next is ``~``, which comes before anything: + ``6.13~rc5`` before ``6.13``, as dpkg sorts it too. + """ + left, right = _VERSION_SEGMENT.findall(a), _VERSION_SEGMENT.findall(b) + for x, y in zip(left, right, strict=False): + if order := _segment_cmp(x, y): + return order + if len(left) == len(right): + return 0 + longer, sign = (left, 1) if len(left) > len(right) else (right, -1) + return -sign if longer[min(len(left), len(right))] == "~" else sign def kernel_reboot_pending(running: str, installed: list[str]) -> str | None: @@ -188,8 +219,9 @@ def kernel_reboot_pending(running: str, installed: list[str]) -> str | None: same = [k for k in installed if _kernel_flavour(k)[1] == flavour] if not same: return None - newest = max(same, key=lambda k: _version_key(_kernel_flavour(k)[0])) - if _version_key(_kernel_flavour(newest)[0]) > _version_key(version): + order = cmp_to_key(_version_cmp) + newest = max(same, key=lambda k: order(_kernel_flavour(k)[0])) + if order(_kernel_flavour(newest)[0]) > order(version): return newest return None diff --git a/pyproject.toml b/pyproject.toml index 30918c6..9ebfb5e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "napalm-device-types" -version = "4.36.1" +version = "4.36.2" description = "Abstract device-type base classes for NAPALM drivers" readme = "README.md" requires-python = ">=3.12" diff --git a/tests/test_host_status.py b/tests/test_host_status.py index f241987..328e525 100644 --- a/tests/test_host_status.py +++ b/tests/test_host_status.py @@ -154,6 +154,24 @@ class TestKernelRebootPending: "5.14.0-503.11.1.el9_5.x86_64", ), ("6.9.7-200.fc40.x86_64", ["6.9.7-200.fc40.x86_64"], None), + # Oracle UEK: 112.5.1 is newer than 112.5, as rpm counts -- a number after + # 5 beats the letters ``el`` (#109, build-arm-01). + ( + "6.12.0-208.112.5.1.el9uek.aarch64", + [ + "6.12.0-207.111.5.6.el9uek.aarch64", + "6.12.0-208.112.5.el9uek.aarch64", + "6.12.0-208.112.5.1.el9uek.aarch64", + ], + None, + ), + ( + "6.12.0-208.112.5.el9uek.aarch64", + ["6.12.0-208.112.5.el9uek.aarch64", "6.12.0-208.112.5.1.el9uek.aarch64"], + "6.12.0-208.112.5.1.el9uek.aarch64", + ), + # A release candidate (``~``) comes before its release, in rpm and in dpkg. + ("6.13~rc5-1-amd64", ["6.13~rc5-1-amd64", "6.13-1-amd64"], "6.13-1-amd64"), ], ) def test_the_newer_kernel_of_the_running_flavour(self, running, installed, newer):