Merge ~adam-collard/maas-ci/+git/system-tests:power-state-directly into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

Query power state directly when waiting

[MAAS Lander (maas-lander)]

UNIT TESTS
-b power-state-directly lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 326ca3d4cfdae88303a4044d1fcf1a6f98dda2bf

review: Approve

[Diego Mascialino (dmascialino)]

review: Approve

diff --git a/systemtests/api.py b/systemtests/api.py
index 4fe28d6..0bf1c14 100644
--- a/systemtests/api.py
+++ b/systemtests/api.py
@@ -65,6 +65,10 @@ class Tag(TypedDict):
     resource_uri: str
 
 
+class PowerResponse(TypedDict):
+    state: str
+
+
 # TODO: Expand these to TypedDict matching API response structure
 
 Subnet = Dict[str, Any]
@@ -662,6 +666,12 @@ class AuthenticatedAPIClient:
         )
         return result
 
+    def query_power_state(self, machine: Machine) -> str:
+        result: PowerResponse = self.execute(
+            ["machine", "query-power-state", machine["system_id"]]
+        )
+        return result["state"]
+
 
 class QuietAuthenticatedAPIClient(AuthenticatedAPIClient):
     """An Authenticated API Client that is quiet."""
diff --git a/systemtests/tests_per_machine/test_hardware_sync.py b/systemtests/tests_per_machine/test_hardware_sync.py
index 3e24d1c..d7f9243 100644
--- a/systemtests/tests_per_machine/test_hardware_sync.py
+++ b/systemtests/tests_per_machine/test_hardware_sync.py
@@ -232,11 +232,8 @@ def test_hardware_sync(
 
     yield remove_device
 
-    system_id = hardware_sync_machine.machine["system_id"]
     for retry_info in retries(60, 5):
-        power_state = maas_api_client.execute(
-            ["machine", system_id, "query-power_state"]
-        )["state"]
+        power_state = maas_api_client.query_power_state(hardware_sync_machine.machine)
         if power_state == "off":
             break
         elif power_state == "on":
diff --git a/systemtests/utils.py b/systemtests/utils.py
index a6302aa..8a829b8 100644
--- a/systemtests/utils.py
+++ b/systemtests/utils.py
@@ -208,8 +208,7 @@ def wait_for_machine_to_power_off(
     """Blocks execution until the given machine is powered off."""
     quiet_client = api.QuietAuthenticatedAPIClient.from_api_client(api_client)
     for retry_info in retries(10 * 60, 10):
-        machine = quiet_client.read_machine(machine)
-        power_state = machine["power_state"]
+        power_state = quiet_client.query_power_state(machine)
         if power_state == "off":
             quiet_client.logger.debug(f"{machine_name} is powered off, continuing")
             return machine