Compare commits
6
Commits
872e5718a3
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
39532471b7 | ||
|
|
5838685690 | ||
|
|
b868f53990 | ||
|
|
8ad1c66ace | ||
|
|
0f4b4f56c4 | ||
|
|
5e371db3af |
@@ -0,0 +1,50 @@
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ["**"]
|
||||
pull_request:
|
||||
branches: ["**"]
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
python-version: ["3.10", "3.11", "3.12"]
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
cache: pip
|
||||
|
||||
- name: Install package with dev extras
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
# napalm-device-types lives in git.netork.io/NAPALM, not on PyPI: without this
|
||||
# pip looks there, finds an unrelated 0.1.0 and the job dies before any test.
|
||||
python -m pip install "napalm-device-types @ git+https://git.netork.io/NAPALM/napalm-device-types.git"
|
||||
# napalm-linux, which this driver builds on, is not on PyPI either.
|
||||
python -m pip install "napalm-linux @ git+https://git.netork.io/NAPALM/napalm-linux.git"
|
||||
python -m pip install -e ".[dev]"
|
||||
|
||||
- name: Run unit tests
|
||||
run: |
|
||||
python -m pytest -q --tb=short
|
||||
|
||||
- name: Build wheel and sdist
|
||||
run: |
|
||||
python -m pip install build
|
||||
python -m build
|
||||
|
||||
- name: Upload dist artifacts
|
||||
# v4 refuses to run on Gitea ("not currently supported on GHES").
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: dist-${{ matrix.python-version }}
|
||||
path: dist/*
|
||||
@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [0.2.0] – 2026-10-07
|
||||
|
||||
### Added
|
||||
- `_container_engine_binary` returns Container Station's docker path, so the
|
||||
container engine connection from napalm-device-types 2.6.0
|
||||
(`open_container_engine("docker")`) reaches it although it is not on PATH.
|
||||
Callers pass arguments only and never see the path (NetOrk/netork#765).
|
||||
|
||||
### Changed
|
||||
- Requires napalm-device-types >= 2.6.0 and napalm-linux >= 0.2.0.
|
||||
|
||||
## [0.1.0]
|
||||
|
||||
### Added
|
||||
- Initial driver scaffold: `QnapQtsDriver(StorageDriver, LinuxDriver)` with
|
||||
discovery fingerprints (SNMP enterprise OID 1.3.6.1.4.1.24681, HTTP, port
|
||||
|
||||
@@ -73,6 +73,11 @@ class QnapQtsDriver(StorageDriver, HypervisorDriver, LinuxDriver):
|
||||
#: makes every "can it control services?" check -- is ``manage_service``
|
||||
#: callable -- answer no, rather than offering buttons that cannot work.
|
||||
manage_service = None # type: ignore[assignment]
|
||||
#: The same for updates: QTS has no apt, dnf or opkg, and QPKG updates are
|
||||
#: not implemented. netOrk leaves a driver without them out of patching.
|
||||
get_available_updates = None # type: ignore[assignment]
|
||||
refresh_available_updates = None # type: ignore[assignment]
|
||||
apply_updates = None # type: ignore[assignment]
|
||||
|
||||
SNMP_OBJECT_ID_PREFIX = QNAP_ENTERPRISE_OID
|
||||
SNMP_FINGERPRINT = [
|
||||
@@ -149,6 +154,12 @@ class QnapQtsDriver(StorageDriver, HypervisorDriver, LinuxDriver):
|
||||
"""Override LinuxDriver's hook: docker is not on PATH under QTS."""
|
||||
return getattr(self, "_docker_path", None) or "docker"
|
||||
|
||||
def _container_engine_binary(self, engine: str) -> str:
|
||||
"""Container Station keeps docker off PATH; callers never see the path."""
|
||||
if engine == "docker":
|
||||
return self._docker_bin()
|
||||
return super()._container_engine_binary(engine)
|
||||
|
||||
# ── QPKG, not apt ─────────────────────────────────────────────────────────
|
||||
#
|
||||
# QTS is Linux, so LinuxDriver's package methods are in the MRO and would
|
||||
|
||||
+3
-3
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "napalm-qnap-qts"
|
||||
version = "0.1.0"
|
||||
version = "0.2.0"
|
||||
description = "NAPALM driver for QNAP NAS systems running QTS via SSH"
|
||||
readme = "README.md"
|
||||
requires-python = ">=3.9"
|
||||
@@ -43,8 +43,8 @@ classifiers = [
|
||||
# processes, Docker) from LinuxDriver rather than reimplementing it.
|
||||
dependencies = [
|
||||
"napalm>=4.0",
|
||||
"napalm-device-types>=0.5.0",
|
||||
"napalm-linux>=0.1.0",
|
||||
"napalm-device-types>=2.6.0",
|
||||
"napalm-linux>=0.2.0",
|
||||
"netmiko>=4.0.0",
|
||||
"paramiko>=5.0.0", # CVE-2026-44405
|
||||
]
|
||||
|
||||
@@ -184,6 +184,27 @@ class TestDockerBinDiscovery:
|
||||
assert driver._docker_bin() == "/opt/docker"
|
||||
|
||||
|
||||
class TestContainerEngineBinary:
|
||||
"""The container engine connection (napalm-device-types 2.6.0) reaches
|
||||
Container Station's docker, not one on PATH: the driver decides where the
|
||||
binary lives, and netOrk never sees it (NetOrk/netork#765)."""
|
||||
|
||||
def test_the_engine_binary_is_the_discovered_path(self, driver):
|
||||
driver._docker_path = "/share/CACHEDEV1_DATA/.qpkg/container-station/bin/docker"
|
||||
assert driver._container_engine_binary("docker") == driver._docker_path
|
||||
|
||||
def test_the_api_stream_runs_dial_stdio_from_that_path(self, driver):
|
||||
driver._docker_path = "/share/CACHEDEV1_DATA/.qpkg/container-station/bin/docker"
|
||||
opened = []
|
||||
with patch.object(driver, "open_stream", side_effect=lambda cmd, **kw: opened.append(cmd)):
|
||||
driver.open_container_engine("docker").open_api()
|
||||
assert opened == [f"{driver._docker_path} system dial-stdio"]
|
||||
|
||||
def test_without_a_discovered_path_it_falls_back_to_plain_docker(self, driver):
|
||||
driver._docker_path = None
|
||||
assert driver._container_engine_binary("docker") == "docker"
|
||||
|
||||
|
||||
def test_services_cannot_be_controlled():
|
||||
"""QTS has no systemd: the systemctl actions inherited from LinuxDriver would
|
||||
fail on every unit, so the driver says it cannot control services at all --
|
||||
@@ -192,3 +213,13 @@ def test_services_cannot_be_controlled():
|
||||
|
||||
assert callable(getattr(LinuxDriver, "manage_service", None))
|
||||
assert not callable(getattr(QnapQtsDriver, "manage_service", None))
|
||||
|
||||
|
||||
|
||||
def test_updates_are_not_read_or_applied_here():
|
||||
"""QTS has no apt, dnf or opkg: the readers inherited from LinuxDriver find no
|
||||
package manager, and QPKG updates are not implemented. Saying so keeps QNAP out
|
||||
of netOrk's patch groups and compliance report, which ask whether these
|
||||
methods are callable."""
|
||||
for method in ("get_available_updates", "refresh_available_updates", "apply_updates"):
|
||||
assert not callable(getattr(QnapQtsDriver, method, None)), method
|
||||
|
||||
Reference in New Issue
Block a user