New 'netplan status' CLI

.github/workflows/autopkgtest.yml

@@ -43,10 +43,9 @@ jobs:
           pull-lp-source netplan.io
           cp -r netplan.io-*/debian .
           rm -r debian/patches/  # clear any distro patches
-          # temporary until 'ethtool' is a proper test dependency
-          sed -i 's/wpasupplicant,/wpasupplicant, ethtool,/g' debian/tests/control
           dch -v $(git describe --tags) "Autopkgtest CI testing (Jammy)"
       - name: Run autopkgtest (incl. build)
         run: |
-          # using --setup-commands temporarily to install cmocka until it becomes a proper build dependency
-          sudo autopkgtest . --setup-commands='apt -y install python3-pytest python3-pytest-cov libcmocka-dev' -U --env=DPKG_GENSYMBOLS_CHECK_LEVEL=0 --env=DEB_BUILD_OPTIONS=nocheck -- lxd autopkgtest/ubuntu/jammy/amd64
+          # using --setup-commands temporarily to install:
+          # cmocka/pytest/rich/ethtool until they become proper test-deps
+          sudo autopkgtest . --setup-commands='apt -y install ethtool python3-rich python3-pytest python3-pytest-cov libcmocka-dev' -U --env=DPKG_GENSYMBOLS_CHECK_LEVEL=0 --env=DEB_BUILD_OPTIONS=nocheck -- lxd autopkgtest/ubuntu/jammy/amd64

.github/workflows/check-coverage.yml

@@ -28,7 +28,7 @@ jobs:
           echo "APT::Get::Always-Include-Phased-Updates \"true\";" | sudo tee /etc/apt/apt.conf.d/90phased-updates
           sudo sed -i '/deb-src/s/^# //' /etc/apt/sources.list
           sudo apt update
-          sudo apt install python3-coverage python3-pytest python3-pytest-cov curl meson gcovr expect libcmocka-dev
+          sudo apt install python3-rich python3-coverage python3-pytest python3-pytest-cov curl meson gcovr expect libcmocka-dev
           sudo apt build-dep netplan.io
 
       # Runs the unit tests with coverage

Makefile

@@ -59,7 +59,7 @@ DOCDIR ?= $(DATADIR)/doc
 MANDIR ?= $(DATADIR)/man
 INCLUDEDIR ?= $(PREFIX)/include
 
-PYCODE = netplan/ $(wildcard src/*.py) $(wildcard tests/*.py) $(wildcard tests/generator/*.py) $(wildcard tests/dbus/*.py)
+PYCODE = netplan/ $(wildcard src/*.py) $(wildcard tests/*.py) $(wildcard tests/generator/*.py) $(wildcard tests/cli/*.py) $(wildcard tests/netplan_dbus/*.py) $(wildcard tests/integration/*.py) $(wildcard tests/parser/*.py)
 
 # Order: Fedora/Mageia/openSUSE || Debian/Ubuntu || null
 PYFLAKES3 ?= $(shell command -v pyflakes-3 || command -v pyflakes3 || echo true)
@@ -109,7 +109,7 @@ clean:
 	rm -f $(TESTS)
 
 check: default linting $(TESTS)
-	PYTHONPATH=. LD_LIBRARY_PATH=. tests/cli.py
+	PYTHONPATH=. LD_LIBRARY_PATH=. tests/cli_legacy.py
 	PYTHONPATH=. LD_LIBRARY_PATH=. $(PYCOVERAGE) run -a -m pytest -s -v --cov-append
 	tests/validate_docs.sh
 

meson.build

@@ -80,7 +80,7 @@ test('documentation',
      find_program('tests/validate_docs.sh'),
      workdir: meson.current_source_dir())
 test('legacy-tests',
-     find_program('tests/cli.py'),
+     find_program('tests/cli_legacy.py'),
      timeout: 120,
      env: test_env)
 #TODO: split out dbus tests into own test() instance, to run in parallel

netplan/cli/commands/__init__.py

@@ -24,6 +24,7 @@
 from netplan.cli.commands.set import NetplanSet
 from netplan.cli.commands.get import NetplanGet
 from netplan.cli.commands.sriov_rebind import NetplanSriovRebind
+from netplan.cli.commands.status import NetplanStatus
 
 __all__ = [
     'NetplanApply',
@@ -34,5 +35,6 @@
     'NetplanInfo',
     'NetplanSet',
     'NetplanGet',
-    'NetplanSriovRebind'
+    'NetplanSriovRebind',
+    'NetplanStatus',
 ]