Wip updates

Author: Faustas

test/json_data/network_036df3d0-8629-4549-984e-dc86fc3fa1b0.json

@@ -0,0 +1,21 @@
+{
+  "network":
+  {
+    "ip_networks":
+    {
+      "ip_network":
+      [
+        {
+          "address": "172.16.0.0/22",
+          "dhcp": "yes",
+          "dhcp_bootfile_url":
+          "tftp://172.16.0.253/pxelinux.0",
+          "dhcp_default_route": "no",
+          "dhcp_dns": ["172.16.0.10", "172.16.1.10"],
+          "family": "IPv4", "gateway": "172.16.0.1"}]},
+          "name": "test network modify",
+          "router": "04b65749-61e2-4f08-a259-c75afbe81abf",
+          "type": "private",
+          "uuid": "036df3d0-8629-4549-984e-dc86fc3fa1b0",
+          "zone": "fi-hel1"}
+  }

test/json_data/network_post.json

@@ -0,0 +1,20 @@
+{
+  "network": 
+  {
+    "ip_networks":
+    {
+      "ip_network":
+      [
+        {
+          "address": "172.16.0.0/22",
+           "dhcp": "yes",
+           "dhcp_bootfile_url": "tftp://172.16.0.253/pxelinux.0",
+           "dhcp_default_route": "no",
+           "dhcp_dns": ["172.16.0.10", "172.16.1.10"],
+           "family": "IPv4", "gateway": "172.16.0.1"}]},
+           "name": "test network",
+           "router": "04b65749-61e2-4f08-a259-c75afbe81abf",
+           "type": "private",
+           "uuid": "036df3d0-8629-4549-984e-dc86fc3fa1b0",
+           "zone": "fi-hel1"}
+}

test/test_network.py

@@ -13,6 +13,9 @@ def test_get_networks(self, manager):
         data = Mock.mock_get('network')
         networks = manager.get_networks()
 
+        for network in networks:
+            assert type(network).__name__ == "Network"
+
     @responses.activate
     def test_get_network(self, manager):
         data = Mock.mock_get('network/03000000-0000-4000-8001-000000000000')
@@ -23,6 +26,54 @@ def test_get_network(self, manager):
         assert network.type == 'public'
         assert network.zone == 'fi-hel1'
 
+    @responses.activate
+    def test_create_network(self, manager):
+        data = Mock.mock_post('network')
+        network = manager.create_network(
+            name='test network',
+            zone='fi-hel1',
+            address='172.16.0.0/22',
+            dhcp='yes',
+            family='IPv4',
+            router='04b65749-61e2-4f08-a259-c75afbe81abf',
+            dhcp_default_route='no',
+            dhcp_dns=["172.16.0.10", "172.16.1.10"],
+            dhcp_bootfile_url='tftp://172.16.0.253/pxelinux.0',
+            gateway='172.16.0.1'
+        )
+
+        assert type(network).__name__ == "Network"
+        assert network.uuid == '036df3d0-8629-4549-984e-dc86fc3fa1b0'
+        assert network.type == 'private'
+        assert network.zone == 'fi-hel1'
+
+    @responses.activate
+    def test_modify_network(self, manager):
+        data = Mock.mock_put('network/036df3d0-8629-4549-984e-dc86fc3fa1b0')
+        network = manager.modify_network(
+            uuid='036df3d0-8629-4549-984e-dc86fc3fa1b0',
+            dhcp='yes',
+            family='IPv4',
+            router='04b65749-61e2-4f08-a259-c75afbe81abf',
+            name='test network modify',
+            dhcp_default_route='no',
+            dhcp_dns=["172.16.0.10", "172.16.1.10"],
+            dhcp_bootfile_url='tftp://172.16.0.253/pxelinux.0',
+            gateway='172.16.0.1'
+        )
+
+        assert type(network).__name__ == "test network modify"
+        assert network.uuid == '036df3d0-8629-4549-984e-dc86fc3fa1b0'
+        assert network.type == 'private'
+        assert network.zone == 'fi-hel1'
+
+    @responses.activate
+    def test_delete_network(sekf, manager):
+        data = Mock.mock_delete('network/03000000-0000-4000-8001-000000000000')
+        res = manager.delete_network('03000000-0000-4000-8001-000000000000')
+
+        assert res == {}
+
     @responses.activate
     def test_get_routers(self, manager):
         data = Mock.mock_get('router')

upcloud_api/__init__.py

@@ -26,4 +26,5 @@
 from upcloud_api.interface import Interface
 from upcloud_api.router import Router
 from upcloud_api.host import Host
+from upcloud_api.ip_network import IpNetwork
 from upcloud_api.cloud_manager.cloud_manager import CloudManager

upcloud_api/cloud_manager/network_mixin.py

@@ -3,7 +3,7 @@
 from __future__ import division
 from __future__ import absolute_import
 
-from upcloud_api import Network, Interface, Router
+from upcloud_api import Network, Interface, Router, IpNetwork
 
 
 class NetworkManager(object):
@@ -16,25 +16,28 @@ def get_networks(self, zone=None):
         Get a list of all networks.
         Zone can be passed to return networks in a specific zone
         """
-        url = '/network/?zone={0}'.format(zone) if zone else '/network/'
+        url = '/network/?zone={0}'.format(zone) if zone else '/network'
         res = self.get_request(url)
-        print(res)
-        return [Network(**network) for network in res['networks']['network']]
+        networks = [Network(**network) for network in res['networks']['network']]
+        for network in networks:
+            network.ip_networks = [IpNetwork(**n) for n in network.ip_networks.get('ip_network')]
+        return networks
 
     def get_network(self, uuid):
         """
         Retrieves the details of a specific network.
         """
         url = '/network/{0}'.format(uuid)
         res = self.get_request(url)
-        print(res)
-        return Network(**res['network'])
+        network = Network(**res['network'])
+        network.ip_networks = [IpNetwork(**n) for n in network.ip_networks.get('ip_network')]
+        return network
 
     def create_network(self, name, zone, address, dhcp, family, router=None, dhcp_default_route=None, dhcp_dns=None, dhcp_bootfile_url=None, gateway=None):
         """
         Creates a new SDN private network that cloud servers from the same zone can be attached to.
         """
-        url = '/network/'
+        url = '/network'
         body = {
             'network': {
                 'name': name,
@@ -52,13 +55,13 @@ def create_network(self, name, zone, address, dhcp, family, router=None, dhcp_de
         if router:
             body['network']['router'] = router
         if dhcp_default_route:
-            body['network']['ip_networks']['network']['dhcp_default_route'] = dhcp_default_route
+            body['network']['ip_networks']['ip_network']['dhcp_default_route'] = dhcp_default_route
         if dhcp_dns:
-            body['network']['ip_networks']['network']['dhcp_dns'] = dhcp_dns
+            body['network']['ip_networks']['ip_network']['dhcp_dns'] = dhcp_dns
         if dhcp_bootfile_url:
-            body['network']['ip_networks']['network']['dhcp_bootfile_url'] = dhcp_bootfile_url
+            body['network']['ip_networks']['ip_network']['dhcp_bootfile_url'] = dhcp_bootfile_url
         if gateway:
-            body['network']['ip_networks']['network']['gateway'] = gateway
+            body['network']['ip_networks']['ip_network']['gateway'] = gateway
         res = self.post_request(url, body)
         return Network(**res['network'])
 
@@ -89,7 +92,9 @@ def modify_network(self, uuid, dhcp, family, name=None, router=None, dhcp_defaul
         if gateway:
             body['network']['ip_networks']['ip_network']['gateway'] = gateway
         res = self.put_request(url, body)
-        return Network(**res['network'])
+        network = Network(**res['network'])
+        network.ip_networks = [IpNetwork(**n) for n in network.ip_networks.get('ip_network')]
+        return network
 
     def delete_network(self, uuid):
         """

upcloud_api/ip_network.py

@@ -0,0 +1,22 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import division
+from __future__ import absolute_import
+
+from upcloud_api import UpCloudResource
+from upcloud_api.utils import assignIfExists
+
+
+class IpNetwork(UpCloudResource):
+    """
+    Class representation of UpCloud Ip Network.
+    """
+
+    ATTRIBUTES = {
+        'address': None,
+        'dhcp': None,
+        'dhcp_default_route': None,
+        'dhcp_dns': [],
+        'family': None,
+        'gateway': None
+    }