Add first batch of thests

Author: LKaemmerling

hcloud/networks/client.py

@@ -44,7 +44,7 @@ def delete(self):
         # type: () -> BoundAction
         """Deletes a network.
 
-        :return:  :class:`BoundAction <hcloud.actions.client.BoundAction>`
+        :return: boolean
         """
         return self._client.delete(self)
 
@@ -245,12 +245,12 @@ def delete(self, network):
         """Deletes a network.
 
         :param network: :class:`BoundNetwork <hcloud.networks.client.BoundNetwork>` or :class:`Network <hcloud.networks.domain.Network>`
-        :return:  :class:`BoundAction <hcloud.actions.client.BoundAction>`
+        :return: boolean
         """
-        response = self._client.request(
+        self._client.request(
             url="/networks/{network_id}".format(network_id=network.id), method="DELETE"
         )
-        return BoundAction(self._client.actions, response["action"])
+        return True
 
     def get_actions_list(
         self, network, status=None, sort=None, page=None, per_page=None
@@ -307,28 +307,97 @@ def get_actions(self, network, status=None, sort=None):
 
     def add_subnet(self, network, subnet):
         # type: (Union[Network, BoundNetwork], NetworkSubnet) -> List[BoundAction]
-        # TODO
-        pass
+        """Adds a subnet entry to a network.
+
+        :param network: :class:`BoundNetwork <hcloud.networks.client.BoundNetwork>` or :class:`Network <hcloud.networks.domain.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>`
+        """
+        data = {
+            "type": subnet.type,
+            "ip_range": subnet.ip_range,
+            "network_zone": subnet.network_zone,
+        }
 
-    def remove_subnet(self, network, subnet):
+        response = self._client.request(
+            url="/networks/{network_id}/actions/add_subnet".format(network_id=network.id),
+            method="POST", json=data)
+        return BoundAction(self._client.actions, response['action'])
+
+    def delete_subnet(self, network, subnet):
         # type: (Union[Network, BoundNetwork], NetworkSubnet) -> List[BoundAction]
-        # TODO
-        pass
+        """Removes a subnet entry from a network
+
+        :param network: :class:`BoundNetwork <hcloud.networks.client.BoundNetwork>` or :class:`Network <hcloud.networks.domain.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>`
+        """
+        data = {
+            "ip_range": subnet.ip_range,
+        }
+
+        response = self._client.request(
+            url="/networks/{network_id}/actions/delete_subnet".format(network_id=network.id),
+            method="POST", json=data)
+        return BoundAction(self._client.actions, response['action'])
 
     def add_route(self, network, route):
         # type: (Union[Network, BoundNetwork], NetworkRoute) -> List[BoundAction]
-        # TODO
-        pass
+        """Adds a route entry to a network.
+
+        :param network: :class:`BoundNetwork <hcloud.networks.client.BoundNetwork>` or :class:`Network <hcloud.networks.domain.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>`
+        """
+        data = {
+            "destination": route.destination,
+            "gateway": route.gateway,
+        }
 
-    def remove_route(self, network, route):
+        response = self._client.request(
+            url="/networks/{network_id}/actions/add_route".format(network_id=network.id),
+            method="POST", json=data)
+        return BoundAction(self._client.actions, response['action'])
+
+    def delete_route(self, network, route):
         # type: (Union[Network, BoundNetwork], NetworkRoute) -> List[BoundAction]
-        # TODO
-        pass
+        """Removes a route entry to a network.
+
+        :param network: :class:`BoundNetwork <hcloud.networks.client.BoundNetwork>` or :class:`Network <hcloud.networks.domain.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>`
+        """
+        data = {
+            "destination": route.destination,
+            "gateway": route.gateway,
+        }
+
+        response = self._client.request(
+            url="/networks/{network_id}/actions/delete_route".format(network_id=network.id),
+            method="POST", json=data)
+        return BoundAction(self._client.actions, response['action'])
 
     def change_ip_range(self, network, ip_range):
         # type: (Union[Network, BoundNetwork], str) -> List[BoundAction]
-        # TODO
-        pass
+        """Changes the IP range of a network.
+
+        :param network: :class:`BoundNetwork <hcloud.networks.client.BoundNetwork>` or :class:`Network <hcloud.networks.domain.Network>`
+        :param ip_range: str
+                    The new prefix for the whole network.
+        :return: :class:`BoundAction <hcloud.actions.client.BoundAction>`
+        """
+        data = {
+            "ip_range": ip_range,
+        }
+
+        response = self._client.request(
+            url="/networks/{network_id}/actions/change_ip_range".format(network_id=network.id),
+            method="POST", json=data)
+        return BoundAction(self._client.actions, response['action'])
 
     def change_protection(self, network, delete=None):
         # type: (Union[Network, BoundNetwork], Optional[bool]) -> BoundAction

hcloud/networks/domain.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from hcloud.core.domain import BaseDomain
+from hcloud.helpers.descriptors import ISODateTime
 
 
 class Network(BaseDomain):
@@ -31,22 +32,27 @@ class Network(BaseDomain):
         "routes",
         "servers",
         "protection",
-        "labels",
+        "labels"
     )
 
+    created = ISODateTime()
+    supported_fields = ("created",)
+
     def __init__(
-        self,
-        id=None,
-        name=None,
-        ip_range=None,
-        subnets=None,
-        routes=None,
-        servers=None,
-        protection=None,
-        labels=None,
+            self,
+            id=None,
+            name=None,
+            created=None,
+            ip_range=None,
+            subnets=None,
+            routes=None,
+            servers=None,
+            protection=None,
+            labels=None,
     ):
         self.id = id
         self.name = name
+        self.created = created
         self.ip_range = ip_range
         self.subnets = subnets
         self.routes = routes
@@ -56,12 +62,13 @@ def __init__(
 
 
 class NetworkSubnet(BaseDomain):
-    __slots__ = ("type", "ip_range", "network_zone")
+    __slots__ = ("type", "ip_range", "network_zone", "gateway")
 
-    def __init__(self, type=None, ip_range=None, network_zone=None):
+    def __init__(self, type=None, ip_range=None, network_zone=None, gateway=None):
         self.type = type
         self.ip_range = ip_range
         self.network_zone = network_zone
+        self.gateway = gateway
 
 
 class NetworkRoute(BaseDomain):
@@ -83,6 +90,10 @@ class CreateNetworkResponse(BaseDomain):
 
     __slots__ = ("network", "action")
 
-    def __init__(self, network, action):  # type: BoundNetwork  # type: BoundAction
+    def __init__(
+            self,
+            network,  # type: BoundNetwork
+            action  # type: BoundAction
+    ):
         self.network = network
         self.action = action

tests/unit/actions/test_domain.py

@@ -7,6 +7,6 @@
 class TestAction(object):
 
     def test_started_finished_is_datetime(self):
-        server = Action(id=1, started="2016-01-30T23:50+00:00", finished="2016-03-30T23:50+00:00")
-        assert server.started == datetime.datetime(2016, 1, 30, 23, 50, tzinfo=tzoffset(None, 0))
-        assert server.finished == datetime.datetime(2016, 3, 30, 23, 50, tzinfo=tzoffset(None, 0))
+        action = Action(id=1, started="2016-01-30T23:50+00:00", finished="2016-03-30T23:50+00:00")
+        assert action.started == datetime.datetime(2016, 1, 30, 23, 50, tzinfo=tzoffset(None, 0))
+        assert action.finished == datetime.datetime(2016, 3, 30, 23, 50, tzinfo=tzoffset(None, 0))