Add subnet type cloud (#81)

Co-authored-by: Marcel Scheck <[email protected]>

Author: mascheck

CHANGELOG.rst

@@ -5,6 +5,7 @@ History
 master (XXXX-XX-XX)
 --------------------
 * Feature: Add support for the optional 'networks' parameter on server creation.
+* Feature: Add subnet type `cloud`
 
 1.6.3 (2020-01-09)
 --------------------

tests/integration/networks/test_networks.py

@@ -13,7 +13,7 @@ def bound_network(self, hetzner_client):
 
     @pytest.fixture()
     def network_subnet(self):
-        return NetworkSubnet(type="server", ip_range="10.0.1.0/24", network_zone="eu-central")
+        return NetworkSubnet(type="cloud", ip_range="10.0.1.0/24", network_zone="eu-central")
 
     @pytest.fixture()
     def network_route(self):
@@ -77,7 +77,7 @@ class TestNetworksClient(object):
 
     @pytest.fixture()
     def network_subnet(self):
-        return NetworkSubnet(type="server", ip_range="10.0.1.0/24", network_zone="eu-central")
+        return NetworkSubnet(type="cloud", ip_range="10.0.1.0/24", network_zone="eu-central")
 
     @pytest.fixture()
     def network_route(self):

tests/unit/networks/conftest.py

@@ -11,7 +11,7 @@ def network_response():
             "ip_range": "10.0.0.0/16",
             "subnets": [
                 {
-                    "type": "server",
+                    "type": "cloud",
                     "ip_range": "10.0.1.0/24",
                     "network_zone": "eu-central",
                     "gateway": "10.0.0.1"
@@ -51,7 +51,7 @@ def two_networks_response():
                 "ip_range": "10.0.0.0/16",
                 "subnets": [
                     {
-                        "type": "server",
+                        "type": "cloud",
                         "ip_range": "10.0.1.0/24",
                         "network_zone": "eu-central",
                         "gateway": "10.0.0.1"
@@ -84,7 +84,7 @@ def two_networks_response():
                 "ip_range": "12.0.0.0/8",
                 "subnets": [
                     {
-                        "type": "server",
+                        "type": "cloud",
                         "ip_range": "12.0.1.0/24",
                         "network_zone": "eu-central",
                         "gateway": "12.0.0.1"
@@ -119,7 +119,7 @@ def one_network_response():
                 "ip_range": "10.0.0.0/16",
                 "subnets": [
                     {
-                        "type": "server",
+                        "type": "cloud",
                         "ip_range": "10.0.1.0/24",
                         "network_zone": "eu-central",
                         "gateway": "10.0.0.1"
@@ -158,7 +158,7 @@ def network_create_response():
             "ip_range": "10.0.0.0/16",
             "subnets": [
                 {
-                    "type": "server",
+                    "type": "cloud",
                     "ip_range": "10.0.1.0/24",
                     "network_zone": "eu-central",
                     "gateway": "10.0.0.1"
@@ -191,7 +191,7 @@ def response_update_network():
             "ip_range": "10.0.0.0/16",
             "subnets": [
                 {
-                    "type": "server",
+                    "type": "cloud",
                     "ip_range": "10.0.1.0/24",
                     "network_zone": "eu-central",
                     "gateway": "10.0.0.1"

tests/unit/networks/test_client.py

@@ -33,7 +33,7 @@ def test_bound_network_init(self, network_response):
 
         assert len(bound_network.subnets) == 2
         assert isinstance(bound_network.subnets[0], NetworkSubnet)
-        assert bound_network.subnets[0].type == "server"
+        assert bound_network.subnets[0].type == "cloud"
         assert bound_network.subnets[0].ip_range == "10.0.1.0/24"
         assert bound_network.subnets[0].network_zone == "eu-central"
         assert bound_network.subnets[0].gateway == "10.0.0.1"
@@ -80,10 +80,10 @@ def test_change_protection(self, hetzner_client, bound_network, generic_action):
 
     def test_add_subnet(self, hetzner_client, bound_network, generic_action):
         hetzner_client.request.return_value = generic_action
-        subnet = NetworkSubnet(type="server", ip_range="10.0.1.0/24", network_zone="eu-central")
+        subnet = NetworkSubnet(type="cloud", ip_range="10.0.1.0/24", network_zone="eu-central")
         action = bound_network.add_subnet(subnet)
         hetzner_client.request.assert_called_with(url="/networks/14/actions/add_subnet", method="POST",
-                                                  json={"type": "server", "ip_range": "10.0.1.0/24",
+                                                  json={"type": "cloud", "ip_range": "10.0.1.0/24",
                                                         "network_zone": "eu-central"})
 
         assert action.id == 1
@@ -137,7 +137,7 @@ def networks_client(self):
 
     @pytest.fixture()
     def network_subnet(self):
-        return NetworkSubnet(type="server", ip_range="10.0.1.0/24", network_zone="eu-central")
+        return NetworkSubnet(type="cloud", ip_range="10.0.1.0/24", network_zone="eu-central")
 
     @pytest.fixture()
     def network_route(self):
@@ -243,7 +243,7 @@ def test_create_with_subnet(self, networks_client, network_subnet, network_creat
                 'ip_range': "10.0.0.0/8",
                 'subnets': [
                     {
-                        'type': "server",
+                        'type': "cloud",
                         'ip_range': "10.0.1.0/24",
                         'network_zone': "eu-central"
                     }
@@ -290,7 +290,7 @@ def test_create_with_route_and_subnet(self, networks_client, network_subnet, net
                 'ip_range': "10.0.0.0/8",
                 'subnets': [
                     {
-                        'type': "server",
+                        'type': "cloud",
                         'ip_range': "10.0.1.0/24",
                         'network_zone': "eu-central"
                     }
@@ -352,7 +352,7 @@ def test_add_subnet(self, networks_client, network, generic_action, network_subn
 
         action = networks_client.add_subnet(network, network_subnet)
         networks_client._client.request.assert_called_with(url="/networks/1/actions/add_subnet", method="POST",
-                                                           json={"type": "server", "ip_range": "10.0.1.0/24",
+                                                           json={"type": "cloud", "ip_range": "10.0.1.0/24",
                                                                  "network_zone": "eu-central"})
 
         assert action.id == 1