Use new get_device

Author: NickCao

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

@@ -68,22 +68,17 @@ async def get_project(self, project_ref: str = "Default Project") -> Optional[Pr
 
         return None
 
-    def get_device(self, model: str) -> Optional[Device]:
+    async def get_device(self, model: str) -> Optional[Device]:
         """
         Get a device spec from Corellium's list based on the model name.
 
         A device object is used to create a new virtual instance.
         """
-        try:
-            res = self.req.get(f"{self.baseurl}/v1/models")
-            data = res.json()
-            res.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            raise CorelliumApiException(data.get("error", str(e))) from e
 
-        for device in data:
-            if device["model"] == model:
-                return Device(**device)
+        models = await self.api.v1_get_models()
+        for device in models:
+            if device.model == model:
+                return device
 
         return None
 

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

@@ -54,41 +54,6 @@ async def test_login_error(requests_mock, status_code, data, msg):
     assert api.session is None
 
 
-@pytest.mark.parametrize(
-    "model,data,has_results",
-    [("rpi4b", fixture("http/get-models-200.json"), True), ("notfound", fixture("http/get-models-200.json"), False)],
-)
-async def test_get_device_ok(requests_mock, model, data, has_results):
-    requests_mock.get("https://api-host/api/v1/models", status_code=200, text=data)
-    api = ApiClient("api-host", "api-token")
-    api.session = Session("session-token", "2022-03-20T01:50:10.000Z")
-
-    device = api.get_device(model)
-
-    if has_results:
-        assert device is not None
-        assert device.model == model
-    else:
-        assert device is None
-
-
-@pytest.mark.parametrize(
-    "status_code,data,msg",
-    [
-        (403, fixture("http/403.json"), "Invalid or missing authorization token"),
-    ],
-)
-async def test_get_device_error(requests_mock, status_code, data, msg):
-    requests_mock.get("https://api-host/api/v1/models", 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_device("mymodel")
-
-    assert msg in str(e.value)
-
-
 async def test_create_instance_ok(requests_mock):
     data = fixture("http/create-instance-200.json")
     requests_mock.post("https://api-host/api/v1/instances", status_code=200, text=data)

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

@@ -158,7 +158,7 @@ async def on(self) -> None:
             raise ValueError(f"Unable to fetch project: {self.parent.project_id}")
         self.logger.info(f"Using project: {project.name}")
 
-        device = self.parent.api.get_device(self.parent.device_flavor)
+        device = await self.parent.api.get_device(self.parent.device_flavor)
         if device is None:
             raise ValueError("Unable to find a device for this model: {self.parent.device_model}")
         self.logger.info(f"Using device spec: {device.name}")