Resolve "Implement client for ISO endpoint"

LKaemmerling · LKaemmerling · commit 0f0697c66764 · 2018-12-12T12:33:11.000+01:00
diff --git a/hcloud/hcloud.py b/hcloud/hcloud.py
@@ -4,6 +4,7 @@
 import requests
 
 from hcloud.actions.client import ActionsClient
+from hcloud.isos.client import IsosClient
 from hcloud.servers.client import ServersClient
 from hcloud.server_types.client import ServerTypesClient
 from hcloud.volumes.client import VolumesClient
@@ -35,6 +36,7 @@ def __init__(self, token):
         self.volumes = VolumesClient(self)
         self.actions = ActionsClient(self)
         self.images = ImagesClient(self)
+        self.isos = IsosClient(self)
 
     def _get_user_agent(self):
         return "hcloud-python/" + self.version
diff --git a/hcloud/iso/client.py b/hcloud/iso/client.py
diff --git a/hcloud/isos/__init__.py b/hcloud/isos/__init__.py
diff --git a/hcloud/isos/client.py b/hcloud/isos/client.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from hcloud.core.client import BoundModelBase, ClientEntityBase
+
+from hcloud.isos.domain import Iso
+
+
+class BoundIso(BoundModelBase):
+    model = Iso
+
+
+class IsosClient(ClientEntityBase):
+
+    def get_by_id(self, id):
+        # type: (int) -> BoundIso
+        response = self._client.request(url="/isos/{iso_id}".format(iso_id=id), method="GET")
+        return BoundIso(self, response['iso'])
+
+    def get_all(self, name=None):
+        # type: (Optional[str]) -> List[BoundIso]
+        params = {}
+        if name:
+            params['name'] = name
+
+        response = self._client.request(url="/isos", method="GET", params=params)
+        return [BoundIso(self, iso_data) for iso_data in response['isos']]
diff --git a/hcloud/isos/domain.py b/hcloud/isos/domain.py
diff --git a/hcloud/servers/client.py b/hcloud/servers/client.py
@@ -2,11 +2,11 @@
 from hcloud.core.client import ClientEntityBase, BoundModelBase
 
 from hcloud.actions.client import BoundAction
+from hcloud.isos.client import BoundIso
 from hcloud.servers.domain import Server, CreateServerResponse, ResetPasswordResponse, EnableRescueResponse, RequestConsoleResponse
 from hcloud.volumes.client import BoundVolume
 from hcloud.images.domain import CreateImageResponse
 from hcloud.images.client import BoundImage
-from hcloud.iso.domain import Iso
 from hcloud.server_types.client import BoundServerType
 from hcloud.datacenters.client import BoundDatacenter
 
@@ -31,8 +31,7 @@ def __init__(self, client, data, complete=False):
 
         iso = data.get("iso", None)
         if iso is not None:
-            # data['iso'] = BoundIso(client._client.iso, iso, complete=True) # When ISO Client is implemented
-            data['iso'] = Iso(**iso)
+            data['iso'] = BoundIso(client._client.isos, iso)
 
         server_type = data.get("server_type")
         if server_type is not None:
diff --git a/tests/integration/isos/__init__.py b/tests/integration/isos/__init__.py
diff --git a/tests/integration/isos/test_isos.py b/tests/integration/isos/test_isos.py
@@ -0,0 +1,14 @@
+class TestIsosClient(object):
+    def test_get_by_id(self, hetzner_client):
+        iso = hetzner_client.isos.get_by_id(1)
+        assert iso.id == 4711
+        assert iso.name == "FreeBSD-11.0-RELEASE-amd64-dvd1"
+        assert iso.description == "FreeBSD 11.0 x64"
+        assert iso.type == "public"
+
+    def test_get_all(self, hetzner_client):
+        isos = hetzner_client.isos.get_all()
+        assert isos[0].id == 4711
+        assert isos[0].name == "FreeBSD-11.0-RELEASE-amd64-dvd1"
+        assert isos[0].description == "FreeBSD 11.0 x64"
+        assert isos[0].type == "public"
diff --git a/tests/integration/servers/test_servers.py b/tests/integration/servers/test_servers.py
@@ -5,7 +5,7 @@
 from hcloud.servers.domain import Server
 from hcloud.volumes.domain import Volume
 from hcloud.images.domain import Image
-from hcloud.iso.domain import Iso
+from hcloud.isos.domain import Iso
 from hcloud.server_types.domain import ServerType
 from hcloud.locations.domain import Location
 
diff --git a/tests/unit/iso/conftest.py b/tests/unit/iso/conftest.py
@@ -0,0 +1,36 @@
+import pytest
+
+
+@pytest.fixture()
+def iso_response():
+    return {
+        "iso": {
+            "id": 4711,
+            "name": "FreeBSD-11.0-RELEASE-amd64-dvd1",
+            "description": "FreeBSD 11.0 x64",
+            "type": "public",
+            "deprecated": "2018-02-28T00:00:00+00:00"
+        }
+    }
+
+
+@pytest.fixture()
+def two_isos_response():
+    return {
+        "isos": [
+            {
+                "id": 4711,
+                "name": "FreeBSD-11.0-RELEASE-amd64-dvd1",
+                "description": "FreeBSD 11.0 x64",
+                "type": "public",
+                "deprecated": "2018-02-28T00:00:00+00:00"
+            },
+            {
+                "id": 4712,
+                "name": "FreeBSD-11.0-RELEASE-amd64-dvd1",
+                "description": "FreeBSD 11.0 x64",
+                "type": "public",
+                "deprecated": "2018-02-28T00:00:00+00:00"
+            }
+        ]
+    }
diff --git a/tests/unit/iso/test_client.py b/tests/unit/iso/test_client.py
@@ -0,0 +1,63 @@
+import pytest
+import mock
+import datetime
+from dateutil.tz import tzoffset
+
+from hcloud.isos.client import IsosClient, BoundIso
+
+
+class TestBoundIso(object):
+
+    @pytest.fixture()
+    def bound_iso(self, hetzner_client):
+        return BoundIso(client=hetzner_client.isos, data=dict(id=14))
+
+    def test_bound_iso_init(self, iso_response):
+        bound_iso = BoundIso(
+            client=mock.MagicMock(),
+            data=iso_response['iso']
+        )
+
+        assert bound_iso.id == 4711
+        assert bound_iso.name == "FreeBSD-11.0-RELEASE-amd64-dvd1"
+        assert bound_iso.description == "FreeBSD 11.0 x64"
+        assert bound_iso.type == "public"
+        assert bound_iso.deprecated == datetime.datetime(2018, 2, 28, 0, 0, tzinfo=tzoffset(None, 0))
+
+
+class TestIsosClient(object):
+
+    @pytest.fixture()
+    def isos_client(self):
+        return IsosClient(client=mock.MagicMock())
+
+    def test_get_by_id(self, isos_client, iso_response):
+        isos_client._client.request.return_value = iso_response
+        iso = isos_client.get_by_id(1)
+        isos_client._client.request.assert_called_with(url="/isos/1", method="GET")
+        assert iso._client is isos_client
+        assert iso.id == 4711
+        assert iso.name == "FreeBSD-11.0-RELEASE-amd64-dvd1"
+
+    def test_get_all_no_params(self, isos_client, two_isos_response):
+        isos_client._client.request.return_value = two_isos_response
+        isos = isos_client.get_all()
+        isos_client._client.request.assert_called_with(url="/isos", method="GET", params={})
+
+        assert len(isos) == 2
+
+        isos1 = isos[0]
+        isos2 = isos[1]
+
+        assert isos1._client is isos_client
+        assert isos1.id == 4711
+        assert isos1.name == "FreeBSD-11.0-RELEASE-amd64-dvd1"
+
+        assert isos2._client is isos_client
+        assert isos2.id == 4712
+        assert isos2.name == "FreeBSD-11.0-RELEASE-amd64-dvd1"
+
+    def test_get_all_with_params(self, isos_client):
+        params = {'name': "FreeBSD-11.0-RELEASE-amd64-dvd1"}
+        isos_client.get_all(**params)
+        isos_client._client.request.assert_called_with(url="/isos", method="GET", params=params)
diff --git a/tests/unit/iso/test_domain.py b/tests/unit/iso/test_domain.py
@@ -1,7 +1,7 @@
 import datetime
 from dateutil.tz import tzoffset
 
-from hcloud.iso.domain import Iso
+from hcloud.isos.domain import Iso
 
 
 class TestIso(object):
diff --git a/tests/unit/servers/test_client.py b/tests/unit/servers/test_client.py
@@ -1,14 +1,15 @@
 import mock
 import pytest
 
+from hcloud.isos.client import BoundIso
 from hcloud.servers.client import ServersClient, BoundServer
 
 from hcloud.servers.domain import Server
 from hcloud.volumes.client import BoundVolume
 from hcloud.volumes.domain import Volume
 from hcloud.images.domain import Image
 from hcloud.images.client import BoundImage
-from hcloud.iso.domain import Iso
+from hcloud.isos.domain import Iso
 from hcloud.datacenters.client import BoundDatacenter
 from hcloud.datacenters.domain import Datacenter
 from hcloud.locations.domain import Location
@@ -55,12 +56,16 @@ def test_bound_server_init(self, response_full_server):
         assert bound_server.volumes[1].complete is False
 
         assert isinstance(bound_server.image, BoundImage)
+        assert bound_server.image._client == bound_server._client._client.images
         assert bound_server.image.id == 4711
         assert bound_server.image.name == "ubuntu-16.04"
+        assert bound_server.image.complete is True
 
-        assert isinstance(bound_server.iso, Iso)
+        assert isinstance(bound_server.iso, BoundIso)
+        assert bound_server.iso._client == bound_server._client._client.isos
         assert bound_server.iso.id == 4711
         assert bound_server.iso.name == "FreeBSD-11.0-RELEASE-amd64-dvd1"
+        assert bound_server.iso.complete is True
 
     def test_get_actions(self, hetzner_client, bound_server, response_get_actions):
         hetzner_client.request.return_value = response_get_actions
