Implement Server PrivateNet

Author: LKaemmerling

hcloud/networks/client.py

@@ -237,7 +237,8 @@ def create(
         """
         data = {"name": name, "ip_range": ip_range}
         if subnets is not None:
-            data["subnets"] = [{'type': subnet.type, 'ip_range': subnet.ip_range, 'network_zone': subnet.network_zone} for subnet in 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"] = [{'destination': route.destination, 'gateway': route.gateway} for route in routes]
         if labels is not None:

hcloud/servers/client.py

@@ -6,7 +6,7 @@
 from hcloud.floating_ips.client import BoundFloatingIP
 from hcloud.isos.client import BoundIso
 from hcloud.servers.domain import Server, CreateServerResponse, ResetPasswordResponse, EnableRescueResponse, \
-    RequestConsoleResponse, PublicNetwork, IPv4Address, IPv6Network
+    RequestConsoleResponse, PublicNetwork, IPv4Address, IPv6Network, PrivateNet
 from hcloud.volumes.client import BoundVolume
 from hcloud.images.domain import CreateImageResponse
 from hcloud.images.client import BoundImage
@@ -50,6 +50,11 @@ def __init__(self, client, data, complete=True):
                             floating_ip in public_net['floating_ips']]
             data['public_net'] = PublicNetwork(ipv4=ipv4_address, ipv6=ipv6_network, floating_ips=floating_ips)
 
+        private_nets = data.get("private_net")
+        if private_nets:
+            private_nets = [PrivateNet(network=BoundNetwork(client._client.networks, {"id": private_net['network']}, complete=False), ip=private_net['ip'], alias_ips=private_net['alias_ips']) for private_net in private_nets]
+            data['private_net'] = private_nets
+
         super(BoundServer, self).__init__(client, data, complete)
 
     def get_actions_list(self, status=None, sort=None, page=None, per_page=None):

hcloud/servers/domain.py

@@ -39,6 +39,8 @@ class Server(BaseDomain):
             User-defined labels (key-value pairs)
     :param volumes: List[:class:`BoundVolume <hcloud.volumes.client.BoundVolume>`]
             Volumes assigned to this server.
+    :param private_net: List[:class:`PrivateNet <hcloud.servers.domain.PrivateNet`]
+            Private networks information.
     """
     STATUS_RUNNING = "running"
     """Server Status running"""
@@ -76,6 +78,7 @@ class Server(BaseDomain):
         "protection",
         "labels",
         "volumes",
+        "private_net"
     )
 
     created = ISODateTime()
@@ -102,6 +105,7 @@ def __init__(
             protection=None,
             labels=None,
             volumes=None,
+            private_net=None,
     ):
         self.id = id
         self.name = name
@@ -121,6 +125,7 @@ def __init__(
         self.protection = protection
         self.labels = labels
         self.volumes = volumes
+        self.private_net = private_net
 
 
 class CreateServerResponse(BaseDomain):
@@ -308,3 +313,29 @@ def __init__(self,
         ip_parts = self.ip.split("/")  # 2001:db8::/64 to 2001:db8:: and 64
         self.network = ip_parts[0]
         self.network_mask = ip_parts[1]
+
+
+class PrivateNet(BaseDomain):
+    """PrivateNet Domain
+
+    :param network: :class:`BoundNetwork <hcloud.networks.client.BoundNetwork>`
+           The network the server is attached to
+    :param ip: str
+           The main IP Address of the server in the Network
+    :param alias_ips: List[str]
+           The alias ips for a server
+    """
+    __slots__ = (
+        "network",
+        "ip",
+        "alias_ips"
+    )
+
+    def __init__(self,
+                 network,  # type: BoundNetwork
+                 ip,  # type: str
+                 alias_ips,  # type: List[str]
+                 ):
+        self.network = network
+        self.ip = ip
+        self.alias_ips = alias_ips

tests/unit/servers/conftest.py

@@ -29,6 +29,13 @@ def response_simple_server():
                     478
                 ]
             },
+            "private_net": [
+                {
+                    "network": 4711,
+                    "ip": "10.1.1.5",
+                    "alias_ips": ["10.1.1.8"]
+                }
+            ],
             "server_type": {
                 "id": 1,
                 "name": "cx11",
@@ -148,6 +155,7 @@ def response_create_simple_server():
                 "floating_ips": [
                 ]
             },
+            "private_net": [],
             "server_type": {
                 "id": 1,
                 "name": "cx11",
@@ -309,6 +317,7 @@ def response_update_server():
                     478
                 ]
             },
+            "private_net": [],
             "server_type": {
                 "id": 1,
                 "name": "cx11",
@@ -437,6 +446,13 @@ def response_simple_servers():
                     478
                 ]
             },
+            "private_net": [
+                {
+                    "network": 4711,
+                    "ip": "10.1.1.5",
+                    "alias_ips": ["10.1.1.8"]
+                }
+            ],
             "server_type": {
                 "id": 1,
                 "name": "cx11",
@@ -550,6 +566,13 @@ def response_simple_servers():
                     478
                 ]
             },
+            "private_net": [
+                {
+                    "network": 4711,
+                    "ip": "10.1.1.7",
+                    "alias_ips": ["10.1.1.99"]
+                }
+            ],
             "server_type": {
                 "id": 1,
                 "name": "cx11",
@@ -670,6 +693,13 @@ def response_full_server():
                     478
                 ]
             },
+            "private_net": [
+                {
+                    "network": 4711,
+                    "ip": "10.1.1.5",
+                    "alias_ips": ["10.1.1.8"]
+                }
+            ],
             "server_type": {
                 "id": 1,
                 "name": "cx11",

tests/unit/servers/test_client.py

@@ -5,7 +5,7 @@
 from hcloud.isos.client import BoundIso
 from hcloud.servers.client import ServersClient, BoundServer
 
-from hcloud.servers.domain import Server, PublicNetwork, IPv4Address, IPv6Network
+from hcloud.servers.domain import Server, PublicNetwork, IPv4Address, IPv6Network, PrivateNet
 from hcloud.volumes.client import BoundVolume
 from hcloud.volumes.domain import Volume
 from hcloud.images.domain import Image
@@ -84,6 +84,13 @@ def test_bound_server_init(self, response_full_server):
         assert bound_server.iso.name == "FreeBSD-11.0-RELEASE-amd64-dvd1"
         assert bound_server.iso.complete is True
 
+        assert len(bound_server.private_net) == 1
+        assert isinstance(bound_server.private_net[0], PrivateNet)
+        assert bound_server.private_net[0].network._client == bound_server._client._client.networks
+        assert bound_server.private_net[0].ip == "10.1.1.5"
+        assert len(bound_server.private_net[0].alias_ips) == 1
+        assert bound_server.private_net[0].alias_ips[0] == "10.1.1.8"
+
     @pytest.mark.parametrize(
         "params",
         [