Add all integration tests

LKaemmerling · LKaemmerling · commit 29b0c3131993 · 2019-05-15T10:58:35.000+02:00
They currently only work with the NEW mock server (because there we can choose the apib download location)
diff --git a/hcloud/networks/client.py b/hcloud/networks/client.py
@@ -12,7 +12,7 @@ class BoundNetwork(BoundModelBase):
     def __init__(self, client, data, complete=True):
         subnets = data.get("subnets", [])
         if subnets is not None:
-            subnets = [NetworkSubnet(**subnet) for subnet in subnets]
+            subnets = [NetworkSubnet(type=subnet['type'], ip_range=subnet['ip_range'], gateway=subnet['gateway'], network_zone=subnet['network_zone']) for subnet in subnets]
             data['subnets'] = subnets
 
         routes = data.get("routes", [])
@@ -78,22 +78,52 @@ def get_actions(self, status=None, sort=None):
 
     def add_subnet(self, subnet):
         # type: (NetworkSubnet) -> List[BoundAction]
+        """Adds a subnet entry to a network.
+
+        :param subnet: :class:`NetworkSubnet <hcloud.networks.domain.NetworkSubnet>`
+                       The NetworkSubnet you want to add to the Network
+        :return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
+        """
         return self._client.add_subnet(self, subnet=subnet)
 
     def delete_subnet(self, subnet):
         # type: (NetworkSubnet) -> List[BoundAction]
+        """Removes a subnet entry from a network
+
+        :param subnet: :class:`NetworkSubnet <hcloud.networks.domain.NetworkSubnet>`
+                       The NetworkSubnet you want to remove from the Network
+        :return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
+        """
         return self._client.delete_subnet(self, subnet=subnet)
 
     def add_route(self, route):
         # type: (NetworkRoute) -> List[BoundAction]
+        """Adds a route entry to a network.
+
+        :param route: :class:`NetworkRoute <hcloud.networks.domain.NetworkRoute>`
+                    The NetworkRoute you want to add to the Network
+        :return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
+        """
         return self._client.add_route(self, route=route)
 
     def delete_route(self, route):
         # type: (NetworkRoute) -> List[BoundAction]
+        """Removes a route entry to a network.
+
+        :param route: :class:`NetworkRoute <hcloud.networks.domain.NetworkRoute>`
+                    The NetworkRoute you want to remove from the Network
+        :return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
+        """
         return self._client.delete_route(self, route=route)
 
     def change_ip_range(self, ip_range):
         # type: (str) -> List[BoundAction]
+        """Changes the IP range of a network.
+
+        :param ip_range: str
+                    The new prefix for the whole network.
+        :return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
+        """
         return self._client.change_ip_range(self, ip_range=ip_range)
 
     def change_protection(self, delete=None):
diff --git a/hcloud/networks/domain.py b/hcloud/networks/domain.py
@@ -62,6 +62,17 @@ def __init__(
 
 
 class NetworkSubnet(BaseDomain):
+    """Network Subnet Domain
+
+    :param type: str
+              Type of sub network.
+    :param ip_range: str
+              Range to allocate IPs from.
+    :param network_zone: str
+              Name of network zone.
+    :param gateway: str
+              Gateway for the route.
+    """
     __slots__ = ("type", "ip_range", "network_zone", "gateway")
 
     def __init__(self, type=None, ip_range=None, network_zone=None, gateway=None):
@@ -72,7 +83,15 @@ def __init__(self, type=None, ip_range=None, network_zone=None, gateway=None):
 
 
 class NetworkRoute(BaseDomain):
-    __slots__ = ("destination", "gateway", "network_zone")
+    """Network Route Domain
+
+    :param destination: str
+           Destination network or host of this route.
+    :param gateway: str
+           Gateway for the route.
+    """
+
+    __slots__ = ("destination", "gateway")
 
     def __init__(self, destination=None, gateway=None):
         self.destination = destination
diff --git a/tests/integration/networks/test_networks.py b/tests/integration/networks/test_networks.py
@@ -0,0 +1,200 @@
+import mock
+import pytest
+
+from hcloud.networks.client import BoundNetwork
+from hcloud.networks.domain import Network, NetworkSubnet, NetworkRoute
+
+
+class TestBoundNetwork(object):
+
+    @pytest.fixture()
+    def bound_network(self, hetzner_client):
+        return BoundNetwork(client=hetzner_client.networks, data=dict(id=4711))
+
+    @pytest.fixture()
+    def network_subnet(self):
+        return NetworkSubnet(type="server", ip_range="10.0.1.0/24", network_zone="eu-central")
+
+    @pytest.fixture()
+    def network_route(self):
+        return NetworkRoute(destination="10.100.1.0/24", gateway="10.0.1.1")
+
+    def test_get_actions_list(self, bound_network):
+        result = bound_network.get_actions_list()
+        actions = result.actions
+
+        assert len(actions) == 1
+        assert actions[0].id == 13
+        assert actions[0].command == "add_subnet"
+
+    def test_update(self, bound_network):
+        network = bound_network.update(name="new-name", labels={})
+        assert network.id == 4711
+        assert network.name == "new-name"
+
+    def test_delete(self, bound_network):
+        resp = bound_network.delete()
+        assert resp is True
+
+    def test_change_protection(self, bound_network):
+        action = bound_network.change_protection(True)
+
+        assert action.id == 13
+        assert action.command == "change_protection"
+
+    def test_add_subnet(self, bound_network, network_subnet):
+        action = bound_network.add_subnet(network_subnet)
+
+        assert action.id == 13
+        assert action.command == "add_subnet"
+
+    def test_delete_subnet(self, bound_network, network_subnet):
+        action = bound_network.delete_subnet(network_subnet)
+
+        assert action.id == 13
+        assert action.command == "delete_subnet"
+
+    def test_add_route(self, bound_network, network_route):
+        action = bound_network.add_route(network_route)
+
+        assert action.id == 13
+        assert action.command == "add_route"
+
+    def test_delete_route(self, bound_network, network_route):
+        action = bound_network.delete_route(network_route)
+
+        assert action.id == 13
+        assert action.command == "delete_route"
+
+    def test_change_ip_range(self, bound_network, ):
+        action = bound_network.change_ip_range("10.0.0.0/12")
+
+        assert action.id == 13
+        assert action.command == "change_ip_range"
+
+
+class TestNetworksClient(object):
+
+    @pytest.fixture()
+    def network_subnet(self):
+        return NetworkSubnet(type="server", ip_range="10.0.1.0/24", network_zone="eu-central")
+
+    @pytest.fixture()
+    def network_route(self):
+        return NetworkRoute(destination="10.100.1.0/24", gateway="10.0.1.1")
+
+    def test_get_by_id(self, hetzner_client):
+        network = hetzner_client.networks.get_by_id(4711)
+        assert network.id == 4711
+        assert network.name == "mynet"
+        assert network.ip_range == "10.0.0.0/16"
+        assert len(network.subnets) == 2
+        assert len(network.routes) == 1
+        assert len(network.servers) == 1
+        assert network.protection['delete'] is False
+
+    def test_get_by_name(self, hetzner_client):
+        network = hetzner_client.networks.get_by_name("mynet")
+        assert network.id == 4711
+        assert network.name == "mynet"
+        assert network.ip_range == "10.0.0.0/16"
+        assert len(network.subnets) == 2
+        assert len(network.routes) == 1
+        assert len(network.servers) == 1
+        assert network.protection['delete'] is False
+
+    def test_get_list(self, hetzner_client):
+        result = hetzner_client.networks.get_list()
+        networks = result.networks
+        assert networks[0].id == 4711
+        assert networks[0].name == "mynet"
+        assert networks[0].ip_range == "10.0.0.0/16"
+        assert len(networks[0].subnets) == 2
+        assert len(networks[0].routes) == 1
+        assert len(networks[0].servers) == 1
+        assert networks[0].protection['delete'] is False
+
+    def test_get_all(self, hetzner_client):
+        networks = hetzner_client.networks.get_all()
+        assert networks[0].id == 4711
+        assert networks[0].name == "mynet"
+        assert networks[0].ip_range == "10.0.0.0/16"
+        assert len(networks[0].subnets) == 2
+        assert len(networks[0].routes) == 1
+        assert len(networks[0].servers) == 1
+        assert networks[0].protection['delete'] is False
+
+    def test_create(self, hetzner_client, network_subnet, network_route):
+        network = hetzner_client.networks.create(name="mynet", ip_range="10.0.0.0/16", subnets=[network_subnet],
+                                                 routes=[network_route])
+        assert network.id == 4711
+        assert network.name == "mynet"
+        assert network.ip_range == "10.0.0.0/16"
+        assert len(network.subnets) == 1
+        assert len(network.routes) == 1
+        assert len(network.servers) == 1
+        assert network.protection['delete'] is False
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_get_actions_list(self, hetzner_client, network):
+        result = hetzner_client.networks.get_actions_list(network)
+        actions = result.actions
+
+        assert len(actions) == 1
+        assert actions[0].id == 13
+        assert actions[0].command == "add_subnet"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_update(self, hetzner_client, network):
+        network = hetzner_client.networks.update(network, name="new-name", labels={})
+
+        assert network.id == 4711
+        assert network.name == "new-name"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_delete(self, hetzner_client, network):
+        result = hetzner_client.networks.delete(network)
+
+        assert result is True
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_change_protection(self, hetzner_client, network):
+        action = hetzner_client.networks.change_protection(network, delete=True)
+
+        assert action.id == 13
+        assert action.command == "change_protection"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_add_subnet(self, hetzner_client, network, network_subnet):
+        action = hetzner_client.networks.add_subnet(network, network_subnet)
+
+        assert action.id == 13
+        assert action.command == "add_subnet"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_delete_subnet(self, hetzner_client, network, network_subnet):
+        action = hetzner_client.networks.delete_subnet(network, network_subnet)
+
+        assert action.id == 13
+        assert action.command == "delete_subnet"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_add_route(self, hetzner_client, network, network_route):
+        action = hetzner_client.networks.add_route(network, network_route)
+
+        assert action.id == 13
+        assert action.command == "add_route"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_delete_route(self, hetzner_client, network, network_route):
+        action = hetzner_client.networks.delete_route(network, network_route)
+
+        assert action.id == 13
+        assert action.command == "delete_route"
+
+    @pytest.mark.parametrize("network", [Network(id=4711), BoundNetwork(mock.MagicMock(), dict(id=4711))])
+    def test_change_ip_range(self, hetzner_client, network):
+        action = hetzner_client.networks.change_ip_range(network, "10.0.0.0/12")
+
+        assert action.id == 13
+        assert action.command == "change_ip_range"
diff --git a/tests/integration/servers/test_servers.py b/tests/integration/servers/test_servers.py
@@ -1,6 +1,8 @@
 import mock
 import pytest
 
+from hcloud.networks.client import BoundNetwork
+from hcloud.networks.domain import Network
 from hcloud.servers.client import BoundServer
 from hcloud.servers.domain import Server
 from hcloud.ssh_keys.domain import SSHKey
@@ -140,6 +142,27 @@ def test_request_console(self, bound_server):
         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, bound_server, network):
+        action = bound_server.attach_to_network(network, ip="10.0.1.1", alias_ips=["10.0.1.2"])
+
+        assert action.id == 13
+        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, bound_server, network):
+        action = bound_server.detach_from_network(network)
+
+        assert action.id == 13
+        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, bound_server, network):
+        action = bound_server.change_alias_ips(network, alias_ips=["10.0.1.2"])
+
+        assert action.id == 13
+        assert action.command == "change_alias_ips"
+
 
 class TestServersClient(object):
 
@@ -161,7 +184,7 @@ def test_get_by_name(self, hetzner_client):
         assert server.image.id == 4711
 
     def test_get_list(self, hetzner_client):
-        result = hetzner_client.servers.get_list(42)
+        result = hetzner_client.servers.get_list()
         servers = result.servers
         assert servers[0].id == 42
         assert servers[0].volumes == []
@@ -170,7 +193,6 @@ def test_get_list(self, hetzner_client):
         assert servers[0].image.id == 4711
 
     def test_create(self, hetzner_client):
-
         response = hetzner_client.servers.create(
             "my-server",
             server_type=ServerType(name="cx11"),
@@ -355,3 +377,27 @@ def test_request_console(self, hetzner_client, server):
         assert response.action.command == "request_console"
         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, hetzner_client, server, network):
+        action = hetzner_client.servers.attach_to_network(server, network, ip="10.0.1.1", alias_ips=["10.0.1.2"])
+
+        assert action.id == 13
+        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, hetzner_client, server, network):
+        action = hetzner_client.servers.detach_from_network(server, network)
+
+        assert action.id == 13
+        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, hetzner_client, server, network):
+        action = hetzner_client.servers.change_alias_ips(server, network, alias_ips=["10.0.1.2"])
+
+        assert action.id == 13
+        assert action.command == "change_alias_ips"
