Use new destroy_instance

Author: NickCao

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

@@ -149,17 +149,11 @@ def set_instance_state(self, instance: Instance, instance_state: str) -> None:
 
             raise CorelliumApiException(msgerr) from e
 
-    def destroy_instance(self, instance: Instance) -> None:
+    async def destroy_instance(self, instance: Instance) -> None:
         """
         Delete a virtual instance.
 
         Does not return anything since Corellium's API return a HTTP 204 response.
         """
-        try:
-            res = self.req.delete(f"{self.baseurl}/v1/instances/{instance.id}")
-            data = res.json() if res.status_code != 204 else None
-            res.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            msgerr = data if data is not None else str(e)
 
-            raise CorelliumApiException(msgerr) from e
+        await self.api.v1_delete_instance(instance.id)

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

@@ -4,7 +4,7 @@
 
 from .api import ApiClient
 from .exceptions import CorelliumApiException
-from .types import Device, Instance, Project, Session
+from .types import Device, Project, Session
 
 pytestmark = pytest.mark.anyio
 
@@ -100,32 +100,3 @@ async def test_create_instance_error(requests_mock, status_code, data, msg):
         api.create_instance("my-instance", project, device, "1.1.1", "Critical Application Monitor (Baremetal)")
 
     assert msg in str(e.value)
-
-
-async def test_destroy_instance_state_ok(requests_mock):
-    instance = Instance(id="d59db33d-27bd-4b22-878d-49e4758a648e")
-
-    requests_mock.delete(f"https://api-host/api/v1/instances/{instance.id}", status_code=204, text="")
-    api = ApiClient("api-host", "api-token")
-    api.session = Session("session-token", "2022-03-20T01:50:10.000Z")
-    api.destroy_instance(instance)
-
-
-@pytest.mark.parametrize(
-    "status_code,data,msg",
-    [
-        (403, fixture("http/403.json"), "Invalid or missing authorization token"),
-        (404, fixture("http/get-instance-state-404.json"), "No instance associated with this value"),
-    ],
-)
-async def test_destroy_instance_error(requests_mock, status_code, data, msg):
-    instance = Instance(id="d59db33d-27bd-4b22-878d-49e4758a648e")
-
-    requests_mock.delete(f"https://api-host/api/v1/instances/{instance.id}", 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.destroy_instance(instance)
-
-    assert msg in str(e.value)

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

@@ -198,7 +198,7 @@ async def off(self, destroy: bool = False) -> None:
         self.wait_instance(instance, Instance(id=instance.id, state="off"))
 
         if destroy:
-            self.parent.api.destroy_instance(instance)
+            await self.parent.api.destroy_instance(instance)
             self.wait_instance(instance, None)
 
     @export