feat(updates): raise PackageIndexMissing when the index is not in RAM
driver / lint (pull_request) Successful in 13s
driver / standard (pull_request) Successful in 16s
driver / types (pull_request) Successful in 46s
driver / test (3.13) (pull_request) Successful in 44s
driver / test (3.12) (pull_request) Successful in 51s
driver / lowest (pull_request) Successful in 25s
driver / build (pull_request) Successful in 25s
driver / security (pull_request) Successful in 55s
CI / driver (pull_request) Successful in 1m55s
driver / publish (pull_request) Skipped
driver / lint (pull_request) Successful in 13s
driver / standard (pull_request) Successful in 16s
driver / types (pull_request) Successful in 46s
driver / test (3.13) (pull_request) Successful in 44s
driver / test (3.12) (pull_request) Successful in 51s
driver / lowest (pull_request) Successful in 25s
driver / build (pull_request) Successful in 25s
driver / security (pull_request) Successful in 55s
CI / driver (pull_request) Successful in 1m55s
driver / publish (pull_request) Skipped
After a reboot apk and opkg have no package index. get_available_updates() raised a bare RuntimeError for that, which netOrk could not tell from a read that failed. It now raises napalm-device-types' PackageIndexMissing, so netOrk loads the index instead of reporting a communication error. Needs napalm-device-types 4.39.0. Refs NetOrk/netork#2527
This commit is contained in:
1 parent
de11d16749
commit
ec88cfd734
4 files changed
+18
-9
No files matched your search
@@ -16,6 +16,8 @@ import logging
|
||||
import re
|
||||
from typing import Any
|
||||
|
||||
from napalm_device_types import PackageIndexMissing
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
#: Printed after a command so its exit status survives the shell session.
|
||||
@@ -447,8 +449,9 @@ class OpenWrtSystemMixin:
|
||||
|
||||
OpenWrt keeps its package index in RAM. Without it -- after a reboot,
|
||||
before ``refresh_available_updates`` -- ``apk version`` only warns and
|
||||
``opkg list-upgradable`` prints nothing. Both raise here instead of
|
||||
reporting "nothing pending".
|
||||
``opkg list-upgradable`` prints nothing. Both raise
|
||||
:exc:`~napalm_device_types.PackageIndexMissing` here instead of reporting
|
||||
"nothing pending".
|
||||
"""
|
||||
if self._pm_type() == "apk":
|
||||
updates = self._updates_apk()
|
||||
@@ -463,7 +466,7 @@ class OpenWrtSystemMixin:
|
||||
if status != 0:
|
||||
raise RuntimeError(f"apk version failed (exit {status}): {output[-200:]}")
|
||||
if _APK_INDEX_MISSING.search(output):
|
||||
raise RuntimeError("The package index is not loaded (run apk update first)")
|
||||
raise PackageIndexMissing("The package index is not loaded (run apk update first)")
|
||||
updates: list[dict[str, Any]] = []
|
||||
for line in output.splitlines():
|
||||
# Output format: "pkgname-current_ver < new_ver"
|
||||
@@ -484,7 +487,7 @@ class OpenWrtSystemMixin:
|
||||
"opkg list-upgradable 2>/dev/null"
|
||||
)
|
||||
if "__NO_INDEX__" in raw:
|
||||
raise RuntimeError("The package index is not loaded (run opkg update first)")
|
||||
raise PackageIndexMissing("The package index is not loaded (run opkg update first)")
|
||||
updates: list[dict[str, Any]] = []
|
||||
for line in raw.splitlines():
|
||||
# opkg output: "pkgname - current_ver - new_ver"
|
||||
|
||||
Reference in new issue
Block a user