Merge ~adam-collard/maas-ci/+git/system-tests:lxd-vm-bug into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

Expose LXD on AuthenticatedAPIClient

Refactor with a tiny change to report machine_name instead of hostname

[Diego Mascialino (dmascialino)]

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lxd-vm-bug lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: cbcdc8148d0104d843bcc034aa2267884c04f5f5

review: Approve

diff --git a/systemtests/api.py b/systemtests/api.py
index cff8d03..7e68c0e 100644
--- a/systemtests/api.py
+++ b/systemtests/api.py
@@ -134,6 +134,10 @@ class AuthenticatedAPIClient:
         return f"<AuthenticatedAPIClient for {self.api_client.url!r}>"
 
     @property
+    def lxd(self) -> lxd.CLILXD:
+        return self.api_client.lxd
+
+    @property
     def logger(self) -> Logger:
         return self.api_client.logger
 
diff --git a/systemtests/conftest.py b/systemtests/conftest.py
index 553be7a..1c92187 100644
--- a/systemtests/conftest.py
+++ b/systemtests/conftest.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from logging import getLogger
 from typing import TYPE_CHECKING, Any, Iterator
 
 import pytest
@@ -28,6 +29,7 @@ from .fixtures import (
     unauthenticated_maas_api_client,
     zone,
 )
+from .lxd import get_lxd
 from .machine_config import MachineConfig
 from .state import (
     authenticated_admin,
@@ -71,6 +73,8 @@ __all__ = [
 
 STATUS_READY = 4
 
+LOG = getLogger("systemtests.conftest")
+
 
 def pytest_addoption(parser: Parser) -> None:
     def config_type(filename: str) -> dict[str, Any]:
@@ -157,13 +161,12 @@ def hardware_sync_machine(
         devices_config=machine_config.devices_config,
     )
     if machine_config.power_type == "lxd":
-        devices = authenticated_admin.api_client.lxd.list_instance_devices(
-            machine_config.name
-        )
-        for device in machine_config.devices_config:
-            if device["device_name"] in devices:
-                authenticated_admin.api_client.lxd.remove_instance_device(
-                    machine_config.name, device["device_name"]
+        lxd = get_lxd(LOG)
+        current_devices = lxd.list_instance_devices(machine_config.name)
+        for additional_device in machine_config.devices_config:
+            if additional_device["device_name"] in current_devices:
+                lxd.remove_instance_device(
+                    machine_config.name, additional_device["device_name"]
                 )
     authenticated_admin.release_machine(machine)
     wait_for_machine(
diff --git a/systemtests/utils.py b/systemtests/utils.py
index 8a829b8..98456d2 100644
--- a/systemtests/utils.py
+++ b/systemtests/utils.py
@@ -197,7 +197,7 @@ def wait_for_new_machine(
     maybe_machines = quiet_client.list_machines(mac_address=mac_address)
     debug_outputs.append(repr(maybe_machines))
     if "lxd" in [m["power_type"] for m in machines]:
-        debug_outputs.append(repr(api_client.api_client.lxd.list_instances()))
+        debug_outputs.append(repr(api_client.lxd.list_instances()))
 
     raise UnexpectedMachineStatus(mac_address, "New", retry_info.elapsed, debug_outputs)
 
@@ -219,11 +219,9 @@ def wait_for_machine_to_power_off(
 
     debug_outputs = [repr(machine)]
     if machine["power_type"] == "lxd":
-        debug_outputs.append(
-            repr(api_client.api_client.lxd.list_instances()[machine_name])
-        )
+        debug_outputs.append(repr(api_client.lxd.list_instances()[machine_name]))
     raise UnexpectedMachineStatus(
-        machine["hostname"], "power_off", retry_info.elapsed, debug_outputs
+        machine_name, "power_off", retry_info.elapsed, debug_outputs
     )