Use new get_project

Author: NickCao

packages/jumpstarter-driver-corellium/jumpstarter_driver_corellium/corellium/api.py

@@ -56,20 +56,15 @@ def login(self) -> None:
         self.session = Session(**data)
         self.req.headers.update(self.session.as_header())
 
-    def get_project(self, project_ref: str = "Default Project") -> Optional[Project]:
+    async def get_project(self, project_ref: str = "Default Project") -> Optional[Project]:
         """
         Retrieve a project based on project_ref, which is either its id or name.
         """
-        try:
-            res = self.req.get(f"{self.baseurl}/v1/projects")
-            data = res.json()
-            res.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            raise CorelliumApiException(data.get("error", str(e))) from e
 
-        for project in data:
-            if project["name"] == project_ref or project["id"] == project_ref:
-                return Project(id=project["id"], name=project["name"])
+        projects = await self.api.v1_get_projects()
+        for project in projects:
+            if project.name == project_ref or project.id == project_ref:
+                return project
 
         return None
 

packages/jumpstarter-driver-corellium/jumpstarter_driver_corellium/corellium/api_test.py

@@ -54,49 +54,6 @@ async def test_login_error(requests_mock, status_code, data, msg):
     assert api.session is None
 
 
-@pytest.mark.parametrize(
-    "project_name,data,has_results",
-    [
-        ("OtherProject", fixture("http/get-projects-200.json"), True),
-        (None, fixture("http/get-projects-200.json"), True),
-        ("notfound", fixture("http/get-projects-200.json"), False),
-    ],
-)
-async def test_get_project_ok(requests_mock, project_name, data, has_results):
-    requests_mock.get("https://api-host/api/v1/projects", status_code=200, text=data)
-    api = ApiClient("api-host", "api-token")
-    api.session = Session("session-token", "2022-03-20T01:50:10.000Z")
-
-    args = []
-    if project_name:
-        args.append(project_name)
-    project = api.get_project(*args)
-
-    if has_results:
-        assert project is not None
-        assert project.name == project_name if project_name is not None else "Default Project"
-    else:
-        assert project is None
-
-
-@pytest.mark.parametrize(
-    "status_code,data,msg",
-    [
-        (403, fixture("http/403.json"), "Invalid or missing authorization token"),
-        (404, fixture("http/get-projects-404.json"), ""),
-    ],
-)
-async def test_get_project_error(requests_mock, status_code, data, msg):
-    requests_mock.get("https://api-host/api/v1/projects", status_code=status_code, text=data)
-    api = ApiClient("api-host", "api-token")
-    api.session = Session("session-token", "2022-03-20T01:50:10.000Z")
-
-    with pytest.raises(CorelliumApiException) as e:
-        api.get_project()
-
-    assert msg in str(e.value)
-
-
 @pytest.mark.parametrize(
     "model,data,has_results",
     [("rpi4b", fixture("http/get-models-200.json"), True), ("notfound", fixture("http/get-models-200.json"), False)],

packages/jumpstarter-driver-corellium/jumpstarter_driver_corellium/driver.py

@@ -142,7 +142,7 @@ def wait_instance(self, current: Instance, desired: Optional[Instance]):
             time.sleep(opts["interval"])
 
     @export
-    def on(self) -> None:
+    async def on(self) -> None:
         """
         Power a Corellium virtual device on.
 
@@ -153,7 +153,7 @@ def on(self) -> None:
         self.logger.info(f"\tDevice Flavor: {self.parent.device_flavor}")
         self.logger.info(f"\tDevice OS Version: {self.parent.device_os}")
 
-        project = self.parent.api.get_project(self.parent.project_id)
+        project = await self.parent.api.get_project(self.parent.project_id)
         if project is None:
             raise ValueError(f"Unable to fetch project: {self.parent.project_id}")
         self.logger.info(f"Using project: {project.name}")
@@ -180,12 +180,12 @@ def on(self) -> None:
         self.wait_instance(instance, Instance(id=instance.id, state="on"))
 
     @export
-    def off(self, destroy: bool = False) -> None:
+    async def off(self, destroy: bool = False) -> None:
         """
         Destroy a Corellium virtual device/instance.
         """
         # fail if project does not exist
-        project = self.parent.api.get_project(self.parent.project_id)
+        project = await self.parent.api.get_project(self.parent.project_id)
         if project is None:
             raise ValueError(f"Unable to fetch project: {self.parent.project_id}")
 

packages/jumpstarter-driver-corellium/jumpstarter_driver_corellium/driver_test.py

@@ -96,7 +96,7 @@ async def test_driver_power_on_ok(monkeypatch):
         patch.object(root._api, "get_instance", side_effect=[None, instance]),
         patch.object(root._api, "create_instance", return_value=instance),
     ):
-        power.on()
+        await power.on()
 
 
 @pytest.mark.parametrize(
@@ -124,7 +124,7 @@ async def test_driver_power_on_error(monkeypatch, mock_data):
             patch.object(root._api, "get_instance", **mock_data.get("get_instance", {"return_value": instance})),
             patch.object(root._api, "create_instance", **mock_data.get("create_instance", {"return_value": instance})),
         ):
-            power.off()
+            await power.off()
 
 
 async def test_driver_power_off_ok(monkeypatch):
@@ -142,7 +142,7 @@ async def test_driver_power_off_ok(monkeypatch):
         patch.object(root._api, "set_instance_state", return_value=None),
         patch.object(root._api, "get_instance", side_effect=[instance, Instance(id=instance.id, state="off")]),
     ):
-        power.off()
+        await power.off()
 
 
 @pytest.mark.parametrize(
@@ -172,4 +172,4 @@ async def test_driver_power_off_error(monkeypatch, mock_data):
                 root._api, "destroy_instance", **mock_data.get("destroy_instance", {"return_value": instance})
             ),
         ):
-            power.off()
+            await power.off()

packages/jumpstarter-driver-corellium/pyproject.toml

@@ -19,7 +19,13 @@ dependencies = [
 Corellium = "jumpstarter_driver_corellium.driver:Corellium"
 
 [dependency-groups]
-dev = ["pytest>=8.3.2", "pytest-cov>=5.0.0", "trio>=0.28.0", "requests_mock"]
+dev = [
+    "pytest>=8.3.2",
+    "pytest-cov>=5.0.0",
+    "trio>=0.28.0",
+    "requests_mock",
+    "pytest-aiohttp>=1.1.0",
+]
 
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"