Add unit tests for the new server actions

Author: LKaemmerling

hcloud/servers/client.py

@@ -805,7 +805,7 @@ def attach_to_network(self, server, network, ip=None, alias_ips=None):
         if ip is not None:
             data.update({"ip": ip})
         if alias_ips is not None:
-            data.update({"alias_ips": ip})
+            data.update({"alias_ips": alias_ips})
         response = self._client.request(
             url="/servers/{server_id}/actions/attach_to_network".format(server_id=server.id), method="POST",
             json=data)

tests/unit/servers/conftest.py

@@ -902,3 +902,87 @@ def response_get_actions():
             }
         ]
     }
+
+
+@pytest.fixture()
+def response_attach_to_network():
+    return {
+        "action": {
+            "id": 1,
+            "command": "attach_to_network",
+            "status": "running",
+            "progress": 0,
+            "started": "2016-01-30T23:50:00+00:00",
+            "finished": None,
+            "resources": [
+                {
+                    "id": 42,
+                    "type": "server"
+                },
+                {
+                    "id": 4711,
+                    "type": "network"
+                }
+            ],
+            "error": {
+                "code": "action_failed",
+                "message": "Action failed"
+            }
+        }
+    }
+
+
+@pytest.fixture()
+def response_detach_from_network():
+    return {
+        "action": {
+            "id": 1,
+            "command": "detach_from_network",
+            "status": "running",
+            "progress": 0,
+            "started": "2016-01-30T23:50:00+00:00",
+            "finished": None,
+            "resources": [
+                {
+                    "id": 42,
+                    "type": "server"
+                },
+                {
+                    "id": 4711,
+                    "type": "network"
+                }
+            ],
+            "error": {
+                "code": "action_failed",
+                "message": "Action failed"
+            }
+        }
+    }
+
+
+@pytest.fixture()
+def response_change_alias_ips():
+    return {
+        "action": {
+            "id": 1,
+            "command": "change_alias_ips",
+            "status": "running",
+            "progress": 0,
+            "started": "2016-01-30T23:50:00+00:00",
+            "finished": None,
+            "resources": [
+                {
+                    "id": 42,
+                    "type": "server"
+                },
+                {
+                    "id": 4711,
+                    "type": "network"
+                }
+            ],
+            "error": {
+                "code": "action_failed",
+                "message": "Action failed"
+            }
+        }
+    }

tests/unit/servers/test_client.py

@@ -17,6 +17,8 @@
 from hcloud.actions.client import BoundAction
 from hcloud.server_types.client import BoundServerType
 from hcloud.server_types.domain import ServerType
+from hcloud.networks.domain import Network
+from hcloud.networks.client import BoundNetwork
 
 
 class TestBoundServer(object):
@@ -293,6 +295,36 @@ def test_request_console(self, hetzner_client, bound_server, response_server_req
         assert response.wss_url == "wss://console.hetzner.cloud/?server_id=1&token=3db32d15-af2f-459c-8bf8-dee1fd05f49c"
         assert response.password == "9MQaTg2VAGI0FIpc10k3UpRXcHj2wQ6x"
 
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_attach_to_network(self, hetzner_client, bound_server, network, response_attach_to_network):
+        hetzner_client.request.return_value = response_attach_to_network
+        action = bound_server.attach_to_network(network, "10.0.1.1", ["10.0.1.2", "10.0.1.3"])
+        hetzner_client.request.assert_called_with(url="/servers/14/actions/attach_to_network", method="POST", json={"network": 4711, "ip": "10.0.1.1", "alias_ips": ["10.0.1.2", "10.0.1.3"]})
+
+        assert action.id == 1
+        assert action.progress == 0
+        assert action.command == "attach_to_network"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_detach_from_network(self, hetzner_client, bound_server, network, response_detach_from_network):
+        hetzner_client.request.return_value = response_detach_from_network
+        action = bound_server.detach_from_network(network)
+        hetzner_client.request.assert_called_with(url="/servers/14/actions/detach_from_network", method="POST", json={"network": 4711})
+
+        assert action.id == 1
+        assert action.progress == 0
+        assert action.command == "detach_from_network"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_change_alias_ips(self, hetzner_client, bound_server, network, response_change_alias_ips):
+        hetzner_client.request.return_value = response_change_alias_ips
+        action = bound_server.change_alias_ips(network, ["10.0.1.2", "10.0.1.3"])
+        hetzner_client.request.assert_called_with(url="/servers/14/actions/change_alias_ips", method="POST", json={"network": 4711, "alias_ips": ["10.0.1.2", "10.0.1.3"]})
+
+        assert action.id == 1
+        assert action.progress == 0
+        assert action.command == "change_alias_ips"
+
 
 class TestServersClient(object):
 
@@ -691,3 +723,36 @@ def test_request_console(self, servers_client, server, response_server_request_c
         assert response.action.progress == 0
         assert response.wss_url == "wss://console.hetzner.cloud/?server_id=1&token=3db32d15-af2f-459c-8bf8-dee1fd05f49c"
         assert response.password == "9MQaTg2VAGI0FIpc10k3UpRXcHj2wQ6x"
+
+    @pytest.mark.parametrize("server", [Server(id=1), BoundServer(mock.MagicMock(), dict(id=1))])
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_attach_to_network(self, servers_client, server, network, response_attach_to_network):
+        servers_client._client.request.return_value = response_attach_to_network
+        action = servers_client.attach_to_network(server, network, "10.0.1.1", ["10.0.1.2", "10.0.1.3"])
+        servers_client._client.request.assert_called_with(url="/servers/1/actions/attach_to_network", method="POST", json={"network": 4711, "ip": "10.0.1.1", "alias_ips": ["10.0.1.2", "10.0.1.3"]})
+
+        assert action.id == 1
+        assert action.progress == 0
+        assert action.command == "attach_to_network"
+
+    @pytest.mark.parametrize("server", [Server(id=1), BoundServer(mock.MagicMock(), dict(id=1))])
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_detach_from_network(self, servers_client, server, network, response_detach_from_network):
+        servers_client._client.request.return_value = response_detach_from_network
+        action = servers_client.detach_from_network(server, network)
+        servers_client._client.request.assert_called_with(url="/servers/1/actions/detach_from_network", method="POST", json={"network": 4711})
+
+        assert action.id == 1
+        assert action.progress == 0
+        assert action.command == "detach_from_network"
+
+    @pytest.mark.parametrize("server", [Server(id=1), BoundServer(mock.MagicMock(), dict(id=1))])
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_change_alias_ips(self, servers_client, server, network, response_change_alias_ips):
+        servers_client._client.request.return_value = response_change_alias_ips
+        action = servers_client.change_alias_ips(server, network, ["10.0.1.2", "10.0.1.3"])
+        servers_client._client.request.assert_called_with(url="/servers/1/actions/change_alias_ips", method="POST", json={"network": 4711, "alias_ips": ["10.0.1.2", "10.0.1.3"]})
+
+        assert action.id == 1
+        assert action.progress == 0
+        assert action.command == "change_alias_ips"