Add --diagnostics to server info
[kamaki] / kamaki / clients / cyclades / test.py
index 1099b65..08f38f8 100644 (file)
 # documentation are those of the authors and should not be
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
+
 from mock import patch, call
 from unittest import TestCase
+from itertools import product
+from json import dumps
 
-from kamaki.clients import ClientError
-from kamaki.clients.cyclades import CycladesClient
+from kamaki.clients import ClientError, cyclades
 
 img_ref = "1m4g3-r3f3r3nc3"
 vm_name = "my new VM"
@@ -51,10 +53,10 @@ vm_recv = dict(server=dict(
     suspended=False,
     progress=0,
     id=31173,
-    metadata=dict(values=dict(os="debian", users="root"))))
-vm_list = dict(servers=dict(values=[
+    metadata=dict(os="debian", users="root")))
+vm_list = dict(servers=[
     dict(name='n1', id=1),
-    dict(name='n2', id=2)]))
+    dict(name='n2', id=2)])
 net_send = dict(network=dict(dhcp=False, name='someNet'))
 net_recv = dict(network=dict(
     status="PENDING",
@@ -69,13 +71,13 @@ net_recv = dict(network=dict(
     cidr="192.168.1.0/24",
     type="MAC_FILTERED",
     gateway=None,
-    attachments=dict(values=[dict(name='att1'), dict(name='att2')])))
-net_list = dict(networks=dict(values=[
+    attachments=[dict(name='att1'), dict(name='att2')]))
+net_list = dict(networks=[
     dict(id=1, name='n1'),
     dict(id=2, name='n2'),
-    dict(id=3, name='n3')]))
-firewalls = dict(attachments=dict(values=[
-    dict(firewallProfile='50m3_pr0f1L3', otherStuff='57uff')]))
+    dict(id=3, name='n3')])
+firewalls = dict(attachments=[
+    dict(firewallProfile='50m3_pr0f1L3', otherStuff='57uff')])
 
 
 class FR(object):
@@ -86,13 +88,111 @@ class FR(object):
     status = None
     status_code = 200
 
-    def release(self):
-        pass
-
+rest_pkg = 'kamaki.clients.cyclades.CycladesRestClient'
 cyclades_pkg = 'kamaki.clients.cyclades.CycladesClient'
 
 
-class Cyclades(TestCase):
+class CycladesRestClient(TestCase):
+
+    def setUp(self):
+        self.url = 'http://cyclades.example.com'
+        self.token = 'cyc14d3s70k3n'
+        self.client = cyclades.CycladesRestClient(self.url, self.token)
+
+    @patch('kamaki.clients.Client.get', return_value='ret')
+    def test_servers_stats_get(self, get):
+        server_id = 'server id'
+        self.assertEqual(self.client.servers_stats_get(server_id), 'ret')
+        get.assert_called_once_with(
+            '/servers/%s/stats' % server_id, success=200)
+
+    @patch('kamaki.clients.Client.get', return_value='ret')
+    def test_servers_diagnostics_get(self, get):
+        server_id = 'server id'
+        self.assertEqual(
+            self.client.servers_diagnostics_get(server_id), 'ret')
+        get.assert_called_once_with(
+            '/servers/%s/diagnostics' % server_id, success=200)
+
+
+class CycladesNetworkClient(TestCase):
+
+    """Set up a ComputesRest thorough test"""
+    def setUp(self):
+        self.url = 'http://network.example.com'
+        self.token = 'n2tw0rk70k3n'
+        self.client = cyclades.CycladesNetworkClient(self.url, self.token)
+
+    def tearDown(self):
+        FR.json = vm_recv
+        del self.client
+
+    @patch('kamaki.clients.Client.get', return_value=FR)
+    def test_list_networks(self, get):
+        FR.json = dict(networks='ret val')
+        for detail in (True, None):
+            self.assertEqual(self.client.list_networks(detail), 'ret val')
+            path = '/networks/detail' if detail else '/networks'
+            self.assertEqual(get.mock_calls[-1], call(path, success=200))
+
+    @patch(
+        'kamaki.clients.network.rest_api.NetworkRestClient.networks_post',
+        return_value=FR())
+    def test_create_network(self, networks_post):
+        for name, shared in product((None, 'net name'), (None, True)):
+            FR.json = dict(network='ret val')
+            type = 'net type'
+            self.assertEqual(
+                self.client.create_network(type, name=name, shared=shared),
+                'ret val')
+            req = dict(type=type, admin_state_up=True)
+            if name:
+                req['name'] = name
+            if shared:
+                req['shared'] = shared
+            expargs = dict(json_data=dict(network=req), success=201)
+            self.assertEqual(networks_post.mock_calls[-1], call(**expargs))
+
+    @patch(
+        'kamaki.clients.network.rest_api.NetworkRestClient.ports_post',
+        return_value=FR)
+    def test_create_port(self, ports_post):
+        network_id, device_id, FR.json = 'netid', 'devid', dict(port='ret v')
+        for name, sec_grp, fixed_ips in product(
+                ('port name', None),
+                ([1, 2, 3], None),
+                (
+                    [dict(subnet_id='sid', ip_address='ipa')],
+                    [dict(subnet_id='sid')], [dict(ip_address='ipa')],
+                    None)):
+
+            if fixed_ips:
+                diff = set(['ip_address', ]).difference(fixed_ips[0])
+                if diff:
+                    self.assertRaises(
+                        ValueError, self.client.create_port,
+                        network_id, device_id,
+                        name=name,
+                        security_groups=sec_grp,
+                        fixed_ips=fixed_ips)
+                    continue
+            self.assertEqual(
+                self.client.create_port(
+                    network_id, device_id,
+                    name=name, security_groups=sec_grp, fixed_ips=fixed_ips),
+                'ret v')
+            req = dict(network_id=network_id, device_id=device_id)
+            if sec_grp:
+                req['security_groups'] = sec_grp
+            if name:
+                req['name'] = name
+            if fixed_ips:
+                req['fixed_ips'] = fixed_ips
+            expargs = dict(json_data=dict(port=req), success=201)
+            self.assertEqual(ports_post.mock_calls[-1], call(**expargs))
+
+
+class CycladesClient(TestCase):
 
     def assert_dicts_are_equal(self, d1, d2):
         for k, v in d1.items():
@@ -106,221 +206,49 @@ class Cyclades(TestCase):
     def setUp(self):
         self.url = 'http://cyclades.example.com'
         self.token = 'cyc14d3s70k3n'
-        self.client = CycladesClient(self.url, self.token)
+        self.client = cyclades.CycladesClient(self.url, self.token)
 
     def tearDown(self):
         FR.status_code = 200
         FR.json = vm_recv
 
-    @patch('%s.servers_get' % cyclades_pkg, return_value=FR())
-    def test_list_servers(self, SG):
-        FR.json = vm_list
-        for detail, since in ((0, 0), (True, 0), (0, 'd473'), (True, 'd473')):
-            r = self.client.list_servers(detail=detail, changes_since=since)
-            self.assertEqual(SG.mock_calls[-1], call(
-                command='detail' if detail else '',
-                changes_since=since))
-            expected = vm_list['servers']['values']
-            for i, vm in enumerate(r):
-                self.assert_dicts_are_equal(vm, expected[i])
-            self.assertEqual(i + 1, len(expected))
-
-    @patch('%s.servers_post' % cyclades_pkg, return_value=FR())
+    @patch('%s.servers_action_post' % cyclades_pkg, return_value=FR())
     def test_shutdown_server(self, SP):
         vm_id = vm_recv['server']['id']
         self.client.shutdown_server(vm_id)
         SP.assert_called_once_with(
-            vm_id, 'action',
-            json_data=dict(shutdown=dict()), success=202)
+            vm_id, json_data=dict(shutdown=dict()), success=202)
 
-    @patch('%s.servers_post' % cyclades_pkg, return_value=FR())
+    @patch('%s.servers_action_post' % cyclades_pkg, return_value=FR())
     def test_start_server(self, SP):
         vm_id = vm_recv['server']['id']
         self.client.start_server(vm_id)
         SP.assert_called_once_with(
-            vm_id, 'action',
-            json_data=dict(start=dict()), success=202)
+            vm_id, json_data=dict(start=dict()), success=202)
 
-    @patch('%s.servers_post' % cyclades_pkg, return_value=FR())
+    @patch('%s.servers_action_post' % cyclades_pkg, return_value=FR())
     def test_get_server_console(self, SP):
         cnsl = dict(console=dict(info1='i1', info2='i2', info3='i3'))
         FR.json = cnsl
         vm_id = vm_recv['server']['id']
         r = self.client.get_server_console(vm_id)
         SP.assert_called_once_with(
-            vm_id, 'action',
-            json_data=dict(console=dict(type='vnc')), success=200)
+            vm_id, json_data=dict(console=dict(type='vnc')), success=200)
         self.assert_dicts_are_equal(r, cnsl['console'])
 
-    def test_get_firewall_profile(self):
-        vm_id = vm_recv['server']['id']
-        v = firewalls['attachments']['values'][0]['firewallProfile']
-        with patch.object(
-                CycladesClient, 'get_server_details',
-                return_value=firewalls) as GSD:
-            r = self.client.get_firewall_profile(vm_id)
-            GSD.assert_called_once_with(vm_id)
-            self.assertEqual(r, v)
-        with patch.object(
-                CycladesClient, 'get_server_details',
-                return_value=dict()):
-            self.assertRaises(
-                ClientError,
-                self.client.get_firewall_profile,
-                vm_id)
-
-    @patch('%s.servers_post' % cyclades_pkg, return_value=FR())
-    def test_set_firewall_profile(self, SP):
-        vm_id = vm_recv['server']['id']
-        v = firewalls['attachments']['values'][0]['firewallProfile']
-        self.client.set_firewall_profile(vm_id, v)
-        SP.assert_called_once_with(
-            vm_id, 'action',
-            json_data=dict(firewallProfile=dict(profile=v)), success=202)
-
-    @patch('%s.servers_get' % cyclades_pkg, return_value=FR())
-    def test_get_server_stats(self, SG):
-        vm_id = vm_recv['server']['id']
-        stats = dict(stat1='v1', stat2='v2', stat3='v3', stat4='v4')
-        FR.json = dict(stats=stats)
-        r = self.client.get_server_stats(vm_id)
-        SG.assert_called_once_with(vm_id, 'stats')
-        self.assert_dicts_are_equal(stats, r)
-
-    @patch('%s.networks_post' % cyclades_pkg, return_value=FR())
-    def test_create_network(self, NP):
-        net_name = net_send['network']['name']
-        FR.json = net_recv
-        full_args = dict(
-                cidr='192.168.0.0/24',
-                gateway='192.168.0.1',
-                type='MAC_FILTERED',
-                dhcp=True)
-        test_args = dict(full_args)
-        test_args.update(dict(empty=None, full=None))
-        net_exp = dict(dhcp=False, name=net_name)
-        for arg, val in test_args.items():
-            kwargs = {} if arg == 'empty' else full_args if (
-                arg == 'full') else {arg: val}
-            expected = dict(network=dict(net_exp))
-            expected['network'].update(kwargs)
-            r = self.client.create_network(net_name, **kwargs)
-            self.assertEqual(
-                NP.mock_calls[-1],
-                call(json_data=expected, success=202))
-            self.assert_dicts_are_equal(r, net_recv['network'])
-
-    @patch('%s.networks_post' % cyclades_pkg, return_value=FR())
-    def test_connect_server(self, NP):
-        vm_id = vm_recv['server']['id']
-        net_id = net_recv['network']['id']
-        self.client.connect_server(vm_id, net_id)
-        NP.assert_called_once_with(
-            net_id, 'action',
-            json_data=dict(add=dict(serverRef=vm_id)))
-
-    @patch('%s.networks_post' % cyclades_pkg, return_value=FR())
-    def test_disconnect_server(self, NP):
-        net_id, vm_id = net_recv['network']['id'], vm_recv['server']['id']
-        nic_id = 'nic-%s-%s' % (net_id, vm_id)
-        vm_nics = [
-            dict(id=nic_id, network_id=net_id),
-            dict(id='another-nic-id', network_id='another-net-id'),
-            dict(id=nic_id * 2, network_id=net_id * 2)]
-        with patch.object(
-                CycladesClient,
-                'list_server_nics',
-                return_value=vm_nics) as LSN:
-            r = self.client.disconnect_server(vm_id, nic_id)
-            LSN.assert_called_once_with(vm_id)
-            NP.assert_called_once_with(
-                net_id, 'action',
-                json_data=dict(remove=dict(attachment=nic_id)))
-            self.assertEqual(r, 1)
-
-    @patch('%s.servers_get' % cyclades_pkg, return_value=FR())
-    def test_list_server_nics(self, SG):
-        vm_id = vm_recv['server']['id']
-        nics = dict(addresses=dict(values=[dict(id='nic1'), dict(id='nic2')]))
-        FR.json = nics
-        r = self.client.list_server_nics(vm_id)
-        SG.assert_called_once_with(vm_id, 'ips')
-        expected = nics['addresses']['values']
-        for i in range(len(r)):
-            self.assert_dicts_are_equal(r[i], expected[i])
-        self.assertEqual(i + 1, len(r))
-
-    @patch('%s.networks_get' % cyclades_pkg, return_value=FR())
-    def test_list_networks(self, NG):
-        FR.json = net_list
-        expected = net_list['networks']['values']
-        for detail in ('', 'detail'):
-            r = self.client.list_networks(detail=True if detail else False)
-            self.assertEqual(NG.mock_calls[-1], call(command=detail))
-            for i, net in enumerate(expected):
-                self.assert_dicts_are_equal(r[i], net)
-            self.assertEqual(i + 1, len(r))
-
-    @patch('%s.networks_get' % cyclades_pkg, return_value=FR())
-    def test_list_network_nics(self, NG):
-        net_id = net_recv['network']['id']
-        FR.json = net_recv
-        r = self.client.list_network_nics(net_id)
-        NG.assert_called_once_with(network_id=net_id)
-        expected = net_recv['network']['attachments']['values']
-        for i in range(len(r)):
-            self.assert_dicts_are_equal(r[i], expected[i])
-
-    @patch('%s.networks_post' % cyclades_pkg, return_value=FR())
-    def test_disconnect_network_nics(self, NP):
-        net_id = net_recv['network']['id']
-        nics = ['nic1', 'nic2', 'nic3']
-        with patch.object(
-                CycladesClient,
-                'list_network_nics',
-                return_value=nics) as LNN:
-            self.client.disconnect_network_nics(net_id)
-            LNN.assert_called_once_with(net_id)
-            for i in range(len(nics)):
-                expected = call(net_id, 'action', json_data=dict(
-                    remove=dict(attachment=nics[i])))
-                self.assertEqual(expected, NP.mock_calls[i])
-
-    @patch('%s.networks_get' % cyclades_pkg, return_value=FR())
-    def test_get_network_details(self, NG):
-        FR.json = net_recv
-        net_id = net_recv['network']['id']
-        r = self.client.get_network_details(net_id)
-        NG.assert_called_once_with(network_id=net_id)
-        self.assert_dicts_are_equal(r, net_recv['network'])
-
-    @patch('%s.networks_put' % cyclades_pkg, return_value=FR())
-    def test_update_network_name(self, NP):
-        net_id = net_recv['network']['id']
-        new_name = '%s_new' % net_id
-        self.client.update_network_name(net_id, new_name)
-        NP.assert_called_once_with(
-            network_id=net_id,
-            json_data=dict(network=dict(name=new_name)))
-
-    def test_delete_network(self):
-        net_id = net_recv['network']['id']
-        with patch.object(
-                CycladesClient, 'networks_delete',
-                return_value=FR()) as ND:
-            self.client.delete_network(net_id)
-            ND.assert_called_once_with(net_id)
-        with patch.object(
-                CycladesClient, 'networks_delete',
-                side_effect=ClientError('A 421 Error', 421)):
-            try:
-                self.client.delete_network(421)
-            except ClientError as err:
-                self.assertEqual(err.status, 421)
-                self.assertEqual(err.details, [
-                    'Network may be still connected to at least one server'])
 
 if __name__ == '__main__':
     from sys import argv
     from kamaki.clients.test import runTestCase
-    runTestCase(Cyclades, 'Cyclades (multi) Client', argv[1:])
+    not_found = True
+    if not argv[1:] or argv[1] == 'CycladesClient':
+        not_found = False
+        runTestCase(CycladesNetworkClient, 'Cyclades Client', argv[2:])
+    if not argv[1:] or argv[1] == 'CycladesNetworkClient':
+        not_found = False
+        runTestCase(CycladesNetworkClient, 'CycladesNetwork Client', argv[2:])
+    if not argv[1:] or argv[1] == 'CycladesRestClient':
+        not_found = False
+        runTestCase(CycladesRestClient, 'CycladesRest Client', argv[2:])
+    if not_found:
+        print('TestCase %s not found' % argv[1])