Add dynamic property "id_or_name" to BaseDomain

Author: LKaemmerling

hcloud/core/domain.py

@@ -1,3 +1,12 @@
 # -*- coding: utf-8 -*-
 class BaseDomain(object):
     __slots__ = ()
+
+    @property
+    def id_or_name(self):
+        if self.id is not None:
+            return self.id
+        elif self.name is not None:
+            return self.name
+        else:
+            raise ValueError("id or name must be set")

hcloud/servers/client.py

@@ -257,18 +257,11 @@ def reset_password(self, server):
 
     def change_type(self, server, server_type, upgrade_disk):
         # type: (servers.domain.Server, BoundServerType, bool) -> actions.domainAction
-        if server_type.id is not None:
-            data = {
-                "server_type": server_type.id
-            }
-        elif server_type.name is not None:
-            data = {
-                "server_type": server_type.name
-            }
-        else:
-            raise ValueError("missing server type")
 
-        data.update({"upgrade_disk": upgrade_disk})
+        data = {
+            "server_type": server_type.id_or_name,
+            "upgrade_disk": upgrade_disk
+        }
         response = self._client.request(url="/servers/{server_id}/actions/change_type".format(server_id=server.id), method="POST", json=data)
         return BoundAction(self._client.actions, response['action'])
 
@@ -307,15 +300,10 @@ def create_image(self, server, description=None, type=None, labels=None):
 
     def rebuild(self, server, image):
         # type: (servers.domain.Server, Image) -> actions.domainAction
-        if image.id is None:
-            data = {
-                "image": image.name
-            }
-        else:
-            data = {
-                "image": image.id
-            }
 
+        data = {
+            "image": image.id_or_name
+        }
         response = self._client.request(url="/servers/{server_id}/actions/rebuild".format(server_id=server.id), method="POST", json=data)
         return BoundAction(self._client.actions, response['action'])
 
@@ -331,14 +319,9 @@ def disable_backup(self, server):
 
     def attach_iso(self, server, iso):
         # type: (servers.domain.Server, Iso) -> actions.domainAction
-        if iso.id is None:
-            data = {
-                "iso": iso.name
-            }
-        else:
-            data = {
-                "iso": iso.id
-            }
+        data = {
+            "iso": iso.id_or_name
+        }
         response = self._client.request(url="/servers/{server_id}/actions/attach_iso".format(server_id=server.id), method="POST", json=data)
         return BoundAction(self._client.actions, response['action'])
 

tests/unit/servers/test_client.py

@@ -459,7 +459,7 @@ def test_change_type_with_server_type_id(self, servers_client, server, generic_a
     def test_change_type_with_blank_server_type(self, servers_client, server):
         with pytest.raises(ValueError) as e:
             servers_client.change_type(server, ServerType(), upgrade_disk=True)
-        assert str(e.value) == "missing server type"
+        assert str(e.value) == "id or name must be set"
         servers_client._client.request.assert_not_called()
 
     @pytest.mark.parametrize("server", [Server(id=1), BoundServer(mock.MagicMock(), dict(id=1))])