More cleanup

Author: NickCao

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

@@ -1,31 +1,22 @@
 from typing import Optional
 
 import corellium_api
-import requests
-
-from .exceptions import CorelliumApiException
-from .types import Device, Instance, Project, Session
+from corellium_api import Instance, Model, Project
 
 
 class ApiClient:
     """
     Corellium ReST API client used by the Corellium driver.
     """
 
-    session: Session
-    req: requests.Session
-
     def __init__(self, host: str, token: str) -> None:
         """
         Initializes a new client, containing a
         """
         self.host = host
-        self.token = token
-        self.session = None
-        self.req = requests.Session()
 
         configuration = corellium_api.Configuration(host=self.baseurl)
-        configuration.access_token = self.token
+        configuration.access_token = token
         self.api = corellium_api.CorelliumApi(corellium_api.ApiClient(configuration))
 
     @property
@@ -35,27 +26,6 @@ def baseurl(self) -> str:
         """
         return f"https://{self.host}/api"
 
-    def login(self) -> None:
-        """
-        Login against Corellium's ReST API.
-
-        Set an internal Session object instance to be used
-        in other API calls that require authentication.
-
-        It uses the global requests objects so a new session can be generated.
-        """
-        data = {"apiToken": self.token}
-
-        try:
-            res = requests.post(f"{self.baseurl}/v1/auth/login", json=data)
-            data = res.json()
-            res.raise_for_status()
-        except (requests.exceptions.RequestException, requests.exceptions.HTTPError) as e:
-            raise CorelliumApiException(data.get("error", str(e))) from e
-
-        self.session = Session(**data)
-        self.req.headers.update(self.session.as_header())
-
     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.
@@ -68,7 +38,7 @@ async def get_project(self, project_ref: str = "Default Project") -> Optional[Pr
 
         return None
 
-    async def get_device(self, model: str) -> Optional[Device]:
+    async def get_device(self, model: str) -> Optional[Model]:
         """
         Get a device spec from Corellium's list based on the model name.
 
@@ -83,7 +53,7 @@ async def get_device(self, model: str) -> Optional[Device]:
         return None
 
     async def create_instance(
-        self, name: str, project: Project, device: Device, os_version: str, os_build: str
+        self, name: str, project: Project, device: Model, os_version: str, os_build: str
     ) -> Instance:
         """
         Create a new virtual instance from a device spec.

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

@@ -5,14 +5,13 @@
 import os
 from collections.abc import AsyncGenerator
 from dataclasses import dataclass, field
-from datetime import datetime, timedelta
 from typing import Dict, Optional
 
 from anyio import sleep
+from corellium_api import Instance
 from jumpstarter_driver_power.driver import PowerReading, VirtualPowerInterface
 
 from .corellium.api import ApiClient
-from .corellium.types import Instance
 from jumpstarter.common import exceptions as jmp_exceptions
 from jumpstarter.driver import Driver, export
 
@@ -87,18 +86,6 @@ def api(self):
         It will also be responsible for creating/refreshing the session token used
         across different API methods that require authentication.
         """
-        # session does not exist, just login and return
-        if self._api.session is None:
-            self._api.login()
-
-            return self._api
-
-        # check if session is about to expire
-        # currently depends on the magic number of 60 seconds
-        now = datetime.utcnow()
-        diff = datetime.strptime(self._api.session.expiration, "%Y-%m-%dT%H:%M:%S.%fZ") - now
-        if diff > timedelta(seconds=1):
-            self._api.login()
 
         return self._api
 

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

@@ -1,8 +1,8 @@
 from unittest.mock import patch
 
 import pytest
+from corellium_api import Instance, Model, Project
 
-from .corellium.types import Device, Instance, Project, Session
 from .driver import Corellium, CorelliumPower
 from jumpstarter.common import exceptions as jmp_exceptions
 
@@ -24,8 +24,6 @@ async def test_driver_corellium_init_ok(monkeypatch):
     assert "jmp" == c.device_name
     assert "kronos" == c.device_flavor
     assert "1.0" == c.device_os
-    assert "api-host" == c._api.host
-    assert "api-token" == c._api.token
 
 
 @pytest.mark.parametrize(
@@ -59,24 +57,12 @@ async def test_driver_corellium_init_error(monkeypatch, env, err):
     assert str(err) == str(e.value)
 
 
-async def test_driver_api_client_ok(monkeypatch, requests_mock):
-    requests_mock.post(
-        "https://api-host/api/v1/auth/login", text='{"token": "token", "expiration": "2022-03-20T01:50:10.000Z"}'
-    )
-    monkeypatch.setenv("CORELLIUM_API_HOST", "api-host")
-    monkeypatch.setenv("CORELLIUM_API_TOKEN", "api-token")
-
-    c = Corellium(project_id="1", device_name="jmp", device_flavor="kronos", device_os="1.0")
-
-    assert Session("token", "2022-03-20T01:50:10.000Z") == c.api.session
-
-
 async def test_driver_power_on_ok(monkeypatch):
     monkeypatch.setenv("CORELLIUM_API_HOST", "api-host")
     monkeypatch.setenv("CORELLIUM_API_TOKEN", "api-token")
 
     project = Project("1", "Default Project")
-    device = Device(
+    device = Model(
         name="rd1ae",
         type="automotive",
         flavor="kronos",
@@ -89,7 +75,6 @@ async def test_driver_power_on_ok(monkeypatch):
     power = CorelliumPower(parent=root)
 
     with (
-        patch.object(root._api, "login", return_value=None),
         patch.object(root._api, "get_project", return_value=project),
         patch.object(root._api, "get_device", return_value=device),
         patch.object(root._api, "get_instance", side_effect=[None, instance]),
@@ -108,7 +93,6 @@ async def test_driver_power_off_ok(monkeypatch):
     power = CorelliumPower(parent=root)
 
     with (
-        patch.object(root._api, "login", return_value=None),
         patch.object(root._api, "get_project", return_value=project),
         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")]),