Add unit tests for all create network cases

Author: LKaemmerling

hcloud/networks/client.py

@@ -123,11 +123,11 @@ def get_by_id(self, id):
         return BoundNetwork(self, response["network"])
 
     def get_list(
-        self,
-        name=None,  # type: Optional[str]
-        label_selector=None,  # type: Optional[str]
-        page=None,  # type: Optional[int]
-        per_page=None,  # type: Optional[int]
+            self,
+            name=None,  # type: Optional[str]
+            label_selector=None,  # type: Optional[str]
+            page=None,  # type: Optional[int]
+            per_page=None,  # type: Optional[int]
     ):
         # type: (...) -> PageResults[List[BoundNetwork], Meta]
         """Get a list of networks from this account
@@ -184,12 +184,12 @@ def get_by_name(self, name):
         return super(NetworksClient, self).get_by_name(name)
 
     def create(
-        self,
-        name,  # type: str
-        ip_range,  # type: str
-        subnets=None,  # type: Optional[List[NetworkSubnet]]
-        routes=None,  # type:  Optional[List[NetworkRoute]]
-        labels=None,  # type:  Optional[Dict[str, str]]
+            self,
+            name,  # type: str
+            ip_range,  # type: str
+            subnets=None,  # type: Optional[List[NetworkSubnet]]
+            routes=None,  # type:  Optional[List[NetworkRoute]]
+            labels=None,  # type:  Optional[Dict[str, str]]
     ):
         """Creates a network with range ip_range.
 
@@ -207,9 +207,9 @@ def create(
         """
         data = {"name": name, "ip_range": ip_range}
         if subnets is not None:
-            data["subnets"] = subnets
+            data["subnets"] = [{'type': subnet.type, 'ip_range': subnet.ip_range, 'network_zone': subnet.network_zone} for subnet in subnets]
         if routes is not None:
-            data["routes"] = routes
+            data["routes"] = [{'destination': route.destination, 'gateway': route.gateway} for route in routes]
         if labels is not None:
             data["labels"] = labels
 
@@ -253,7 +253,7 @@ def delete(self, network):
         return True
 
     def get_actions_list(
-        self, network, status=None, sort=None, page=None, per_page=None
+            self, network, status=None, sort=None, page=None, per_page=None
     ):
         # type: (Network, Optional[List[str]], Optional[List[str]], Optional[int], Optional[int]) -> PageResults[List[BoundAction], Meta]
         """Returns all action objects for a network.

tests/unit/networks/test_client.py

@@ -126,6 +126,14 @@ class TestNetworksClient(object):
     def networks_client(self):
         return NetworksClient(client=mock.MagicMock())
 
+    @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, networks_client, network_response):
         networks_client._client.request.return_value = network_response
         bound_network = networks_client.get_by_id(1)
@@ -195,3 +203,94 @@ def test_get_by_name(self, networks_client, one_network_response):
         assert bound_network._client is networks_client
         assert bound_network.id == 1
         assert bound_network.name == "mynet"
+
+    def test_create(self, networks_client, network_create_response):
+        networks_client._client.request.return_value = network_create_response
+        networks_client.create(
+            name="mynet",
+            ip_range="10.0.0.0/8"
+        )
+        networks_client._client.request.assert_called_with(
+            url="/networks",
+            method="POST",
+            json={
+                'name': "mynet",
+                'ip_range': "10.0.0.0/8",
+            }
+        )
+
+    def test_create_with_subnet(self, networks_client, network_subnet, network_create_response):
+        networks_client._client.request.return_value = network_create_response
+        networks_client.create(
+            name="mynet",
+            ip_range="10.0.0.0/8",
+            subnets=[network_subnet]
+        )
+        networks_client._client.request.assert_called_with(
+            url="/networks",
+            method="POST",
+            json={
+                'name': "mynet",
+                'ip_range': "10.0.0.0/8",
+                'subnets': [
+                    {
+                        'type': "server",
+                        'ip_range': "10.0.1.0/24",
+                        'network_zone': "eu-central"
+                    }
+                ]
+            }
+        )
+
+    def test_create_with_route(self, networks_client, network_route, network_create_response):
+        networks_client._client.request.return_value = network_create_response
+        networks_client.create(
+            name="mynet",
+            ip_range="10.0.0.0/8",
+            routes=[network_route]
+        )
+        networks_client._client.request.assert_called_with(
+            url="/networks",
+            method="POST",
+            json={
+                'name': "mynet",
+                'ip_range': "10.0.0.0/8",
+                'routes': [
+                    {
+                        'destination': "10.100.1.0/24",
+                        'gateway': "10.0.1.1",
+                    }
+                ]
+            }
+        )
+
+    def test_create_with_route_and_subnet(self, networks_client, network_subnet, network_route,
+                                          network_create_response):
+        networks_client._client.request.return_value = network_create_response
+        networks_client.create(
+            name="mynet",
+            ip_range="10.0.0.0/8",
+            subnets=[network_subnet],
+            routes=[network_route]
+        )
+        networks_client._client.request.assert_called_with(
+            url="/networks",
+            method="POST",
+            json={
+                'name': "mynet",
+                'ip_range': "10.0.0.0/8",
+                'subnets': [
+                    {
+                        'type': "server",
+                        'ip_range': "10.0.1.0/24",
+                        'network_zone': "eu-central"
+                    }
+                ],
+                'routes': [
+                    {
+                        'destination': "10.100.1.0/24",
+                        'gateway': "10.0.1.1",
+                    }
+                ]
+            }
+        )