Merge ~adam-collard/maas-ci/+git/system-tests:strict-mypy into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

Less Any, more types

[MAAS Lander (maas-lander)]

UNIT TESTS
-b strict-mypy lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: ef3006582340306efb9c56833eb34f3f09258062

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/systemtests/api.py b/systemtests/api.py
index a82fde4..ed92d21 100644
--- a/systemtests/api.py
+++ b/systemtests/api.py
@@ -262,16 +262,17 @@ class AuthenticatedAPIClient:
             delay=30,
         )
 
-    def create_zone(self, name: str, description: str) -> Any:
-        return self.execute(
+    def create_zone(self, name: str, description: str) -> dict[str, Any]:
+        zone: dict[str, Any] = self.execute(
             ["zones", "create", f"name={name}", f"description={description}"]
         )
+        return zone
 
     def list_zones(self) -> list[dict[str, Any]]:
         zones: list[dict[str, Any]] = self.execute(["zones", "read"])
         return zones
 
-    def read_zone(self, zone_name: str) -> Any:
+    def read_zone(self, zone_name: str) -> dict[str, Any]:
         zone: dict[str, Any] = self.execute(["zone", "read", zone_name])
         return zone
 
@@ -280,7 +281,7 @@ class AuthenticatedAPIClient:
         zone_name: str,
         new_name: Optional[str] = None,
         new_description: Optional[str] = None,
-    ) -> Any:
+    ) -> dict[str, Any]:
         cmd = ["zone", "update", zone_name]
         if new_name is not None:
             cmd.append(f"name={new_name}")
@@ -301,10 +302,11 @@ class AuthenticatedAPIClient:
         else:
             return result
 
-    def create_pool(self, name: str, description: str) -> Any:
-        return self.execute(
+    def create_pool(self, name: str, description: str) -> dict[str, Any]:
+        pool: dict[str, Any] = self.execute(
             ["resource-pools", "create", f"name={name}", f"description={description}"]
         )
+        return pool
 
     def list_pools(self) -> list[dict[str, Any]]:
         resource_pools: list[dict[str, Any]] = self.execute(["resource-pools", "read"])
@@ -331,11 +333,12 @@ class AuthenticatedAPIClient:
         pool_obj: dict[str, Any] = self.execute(cmd)
         return pool_obj
 
-    def delete_pool(self, pool: dict[str, Any]) -> Any:
+    def delete_pool(self, pool: dict[str, Any]) -> str:
         try:
-            return self.execute(
+            result: str = self.execute(
                 ["resource-pool", "delete", str(pool["id"])], json_output=False
             )
+            return result
         except CalledProcessError as err:
             if "cannot be deleted" in err.stdout:
                 raise CannotDeleteError(err.stdout)
diff --git a/systemtests/region.py b/systemtests/region.py
index 5ca3901..ed8856f 100644
--- a/systemtests/region.py
+++ b/systemtests/region.py
@@ -10,7 +10,7 @@ from .lxd import get_lxd
 from .utils import retries
 
 if TYPE_CHECKING:
-    from . import api
+    from .api import AuthenticatedAPIClient
 
 LOG = getLogger("systemtests.region")
 
@@ -35,7 +35,9 @@ class MAASRegion:
         except subprocess.CalledProcessError:
             return False
 
-    def create_user(self, user: str, password: str, email: str) -> Any:
+    def create_user(
+        self, user: str, password: str, email: str
+    ) -> subprocess.CompletedProcess[str]:
         return self.execute(
             [
                 "maas",
@@ -62,7 +64,7 @@ class MAASRegion:
         }
 
     def enable_dhcp(
-        self, config: dict[str, Any], client: api.AuthenticatedAPIClient
+        self, config: dict[str, Any], client: AuthenticatedAPIClient
     ) -> None:
         rack_controllers = get_rack_controllers(client)
         for network in config["networks"].values():
@@ -85,7 +87,7 @@ class MAASRegion:
             raise AssertionError("DHCP couldn't be enabled.")
 
     def disable_dhcp(
-        self, config: dict[str, Any], client: api.AuthenticatedAPIClient
+        self, config: dict[str, Any], client: AuthenticatedAPIClient
     ) -> None:
         rack_controllers = get_rack_controllers(client)
         ip_ranges = client.list_ip_ranges()
@@ -114,7 +116,7 @@ class MAASRegion:
         lxd = get_lxd(LOG)
         return lxd.file_exists(self.maas_container, dhcpd_conf_path)
 
-    def set_config(self, key: str, value: str = "") -> Any:
+    def set_config(self, key: str, value: str = "") -> subprocess.CompletedProcess[str]:
         if self.installed_from_snap:
             prefix_cmd = ["maas", "config"]
         else:
@@ -122,14 +124,14 @@ class MAASRegion:
         cmd = prefix_cmd + [f"--{key}", value]
         return self.execute(cmd)
 
-    def restart(self) -> Any:
+    def restart(self) -> subprocess.CompletedProcess[str]:
         if self.installed_from_snap:
             cmd = ["snap", "restart", "maas"]
         else:
             cmd = ["systemctl", "restart", "maas-regiond"]
         return self.execute(cmd)
 
-    def enable_debug(self) -> Any:
+    def enable_debug(self) -> subprocess.CompletedProcess[str]:
         if self.installed_from_snap:
             return self.execute(["maas", "config", "--enable-debug"])
         else:
@@ -147,7 +149,7 @@ def get_dhcp_controller(
     raise AssertionError(f"Couldn't find rack controller managing DHCP for {cidr}")
 
 
-def get_rack_controllers(client: api.AuthenticatedAPIClient) -> list[dict[str, Any]]:
+def get_rack_controllers(client: AuthenticatedAPIClient) -> list[dict[str, Any]]:
     """Repeatedly attempt to get rack controllers"""
     attempts = count(1)
     for elapsed, _ in retries(timeout=300, delay=10):