from mock import patch, call
from unittest import TestCase
+from itertools import product
+from json import dumps
+from kamaki.clients.compute import ComputeClient, ComputeRestClient
from kamaki.clients import ClientError
-from kamaki.clients.cyclades import CycladesClient
-compute_pkg = 'kamaki.clients.cyclades.CycladesClient'
+rest_pkg = 'kamaki.clients.compute.rest_api.ComputeRestClient'
+compute_pkg = 'kamaki.clients.compute.ComputeClient'
img_ref = "1m4g3-r3f3r3nc3"
vm_name = "my new VM"
pass
-class Cyclades(TestCase):
+class ComputeRest(TestCase):
+
+ """Set up a ComputesRest thorough test"""
+ def setUp(self):
+ self.url = 'http://cyclades.example.com'
+ self.token = 'cyc14d3s70k3n'
+ self.client = ComputeRestClient(self.url, self.token)
+
+ def tearDown(self):
+ FR.json = vm_recv
+
+ @patch('%s.get' % rest_pkg, return_value=FR())
+ def _test_get(self, service, get):
+ for args in product(
+ ('', '%s_id' % service),
+ ('', 'cmd'),
+ (200, 204),
+ ({}, {'k': 'v'})):
+ (srv_id, command, success, kwargs) = args
+ method = getattr(self.client, '%s_get' % service)
+ method(*args[:3], **kwargs)
+ srv_str = '/%s' % srv_id if srv_id else ''
+ cmd_str = '/%s' % command if command else ''
+ self.assertEqual(get.mock_calls[-1], call(
+ '/%s%s%s' % (service, srv_str, cmd_str),
+ success=success,
+ **kwargs))
+
+ def test_servers_get(self):
+ self._test_get('servers')
+
+ def test_flavors_get(self):
+ self._test_get('flavors')
+
+ def test_images_get(self):
+ self._test_get('images')
+
+ @patch('%s.delete' % rest_pkg, return_value=FR())
+ def _test_delete(self, service, delete):
+ for args in product(
+ ('', '%s_id' % service),
+ ('', 'cmd'),
+ (204, 208),
+ ({}, {'k': 'v'})):
+ (srv_id, command, success, kwargs) = args
+ method = getattr(self.client, '%s_delete' % service)
+ method(*args[:3], **kwargs)
+ vm_str = '/%s' % srv_id if srv_id else ''
+ cmd_str = '/%s' % command if command else ''
+ self.assertEqual(delete.mock_calls[-1], call(
+ '/%s%s%s' % (service, vm_str, cmd_str),
+ success=success,
+ **kwargs))
+
+ def test_servers_delete(self):
+ self._test_delete('servers')
+
+ def test_images_delete(self):
+ self._test_delete('images')
+
+ @patch('%s.set_header' % rest_pkg)
+ @patch('%s.post' % rest_pkg, return_value=FR())
+ def _test_post(self, service, post, SH):
+ for args in product(
+ ('', '%s_id' % service),
+ ('', 'cmd'),
+ (None, [dict(json="data"), dict(data="json")]),
+ (202, 204),
+ ({}, {'k': 'v'})):
+ (srv_id, command, json_data, success, kwargs) = args
+ method = getattr(self.client, '%s_post' % service)
+ method(*args[:4], **kwargs)
+ vm_str = '/%s' % srv_id if srv_id else ''
+ cmd_str = '/%s' % command if command else ''
+ if json_data:
+ json_data = dumps(json_data)
+ self.assertEqual(SH.mock_calls[-2:], [
+ call('Content-Type', 'application/json'),
+ call('Content-Length', len(json_data))])
+ self.assertEqual(post.mock_calls[-1], call(
+ '/%s%s%s' % (service, vm_str, cmd_str),
+ data=json_data, success=success,
+ **kwargs))
+
+ def test_servers_post(self):
+ self._test_post('servers')
+
+ def test_images_post(self):
+ self._test_post('images')
+
+ @patch('%s.set_header' % rest_pkg)
+ @patch('%s.put' % rest_pkg, return_value=FR())
+ def _test_put(self, service, put, SH):
+ for args in product(
+ ('', '%s_id' % service),
+ ('', 'cmd'),
+ (None, [dict(json="data"), dict(data="json")]),
+ (204, 504),
+ ({}, {'k': 'v'})):
+ (server_id, command, json_data, success, kwargs) = args
+ method = getattr(self.client, '%s_put' % service)
+ method(*args[:4], **kwargs)
+ vm_str = '/%s' % server_id if server_id else ''
+ cmd_str = '/%s' % command if command else ''
+ if json_data:
+ json_data = dumps(json_data)
+ self.assertEqual(SH.mock_calls[-2:], [
+ call('Content-Type', 'application/json'),
+ call('Content-Length', len(json_data))])
+ self.assertEqual(put.mock_calls[-1], call(
+ '/%s%s%s' % (service, vm_str, cmd_str),
+ data=json_data, success=success,
+ **kwargs))
+
+ def test_servers_put(self):
+ self._test_put('servers')
+
+ def test_images_put(self):
+ self._test_put('images')
+
+
+class Compute(TestCase):
def assert_dicts_are_equal(self, d1, d2):
for k, v in d1.items():
def setUp(self):
self.url = 'http://cyclades.example.com'
self.token = 'cyc14d3s70k3n'
- self.client = CycladesClient(self.url, self.token)
- from kamaki.clients.connection.kamakicon import KamakiHTTPConnection
- self.C = KamakiHTTPConnection
+ self.client = ComputeClient(self.url, self.token)
def tearDown(self):
FR.status_code = 200
return_value=img_recv['image'])
def test_create_server(self, GID):
with patch.object(
- CycladesClient, 'servers_post',
+ ComputeClient, 'servers_post',
side_effect=ClientError(
'REQUEST ENTITY TOO LARGE',
status=403)):
ClientError,
self.client.create_server,
vm_name, fid, img_ref)
- self.assertEqual(GID.mock_calls[-1], call(img_ref))
with patch.object(
- CycladesClient, 'servers_post',
+ ComputeClient, 'servers_post',
return_value=FR()) as post:
r = self.client.create_server(vm_name, fid, img_ref)
self.assertEqual(r, FR.json['server'])
FR.json = vm_list
for detail in (False, True):
r = self.client.list_servers(detail)
+ self.assertEqual(SG.mock_calls[-1], call(
+ command='detail' if detail else ''))
for i, vm in enumerate(vm_list['servers']['values']):
self.assert_dicts_are_equal(r[i], vm)
self.assertEqual(i + 1, len(r))
- self.assertEqual(SG.mock_calls[-1], call(
- changes_since=None,
- command='detail' if detail else ''))
@patch('%s.servers_get' % compute_pkg, return_value=FR())
def test_get_server_details(self, SG):
vm_id = vm_recv['server']['id']
r = self.client.get_server_details(vm_id)
+ SG.assert_called_once_with(vm_id)
self.assert_dicts_are_equal(r, vm_recv['server'])
- self.assertEqual(SG.mock_calls[-1], call(vm_id))
@patch('%s.servers_put' % compute_pkg, return_value=FR())
def test_update_server_name(self, SP):
vm_id = vm_recv['server']['id']
new_name = vm_name + '_new'
self.client.update_server_name(vm_id, new_name)
- self.assertEqual(SP.mock_calls[-1], call(vm_id, json_data=dict(
- server=dict(name=new_name))))
+ SP.assert_called_once_with(vm_id, json_data=dict(
+ server=dict(name=new_name)))
@patch('%s.servers_post' % compute_pkg, return_value=FR())
def test_reboot_server(self, SP):
metadata = dict(m1='v1', m2='v2', m3='v3')
FR.json = dict(metadata=dict(values=metadata))
r = self.client.get_server_metadata(vm_id)
- self.assertEqual(SG.mock_calls[-1], call(vm_id, '/meta'))
+ SG.assert_called_once_with(vm_id, '/meta')
self.assert_dicts_are_equal(r, metadata)
for k, v in metadata.items():
FR.json = dict(metadata=metadata)
r = self.client.update_server_metadata(vm_id, **metadata)
self.assert_dicts_are_equal(r, metadata)
- self.assertEqual(SP.mock_calls[-1], call(
+ SP.assert_called_once_with(
vm_id, 'meta',
- json_data=dict(metadata=metadata), success=201))
+ json_data=dict(metadata=metadata), success=201)
@patch('%s.servers_delete' % compute_pkg, return_value=FR())
def test_delete_server_metadata(self, SD):
vm_id = vm_recv['server']['id']
key = 'metakey'
self.client.delete_server_metadata(vm_id, key)
- self.assertEqual(SD.mock_calls[-1], call(vm_id, 'meta/' + key))
+ SD.assert_called_once_with(vm_id, 'meta/' + key)
@patch('%s.flavors_get' % compute_pkg, return_value=FR())
def test_list_flavors(self, FG):
def test_get_flavor_details(self, FG):
FR.json = dict(flavor=flavor_list['flavors'])
r = self.client.get_flavor_details(fid)
- self.assertEqual(FG.mock_calls[-1], call(fid))
+ FG.assert_called_once_with(fid)
self.assert_dicts_are_equal(r, flavor_list['flavors'])
@patch('%s.images_get' % compute_pkg, return_value=FR())
def test_get_image_details(self, IG):
FR.json = img_recv
r = self.client.get_image_details(img_ref)
- self.assertEqual(IG.mock_calls[-1], call(img_ref))
+ IG.assert_called_once_with(img_ref)
self.assert_dicts_are_equal(r, img_recv['image'])
@patch('%s.images_get' % compute_pkg, return_value=FR())
def test_get_image_metadata(self, IG):
- FR.json = dict(metadata=dict(values=img_recv['image']))
- r = self.client.get_image_metadata(img_ref)
- self.assertEqual(IG.mock_calls[-1], call('%s' % img_ref, '/meta'))
- self.assert_dicts_are_equal(img_recv['image'], r)
- FR.json = dict(meta=img_recv['image'])
- key = 'somekey'
- r = self.client.get_image_metadata(img_ref, key)
- self.assertEqual(
- IG.mock_calls[-1],
- call('%s' % img_ref, '/meta/%s' % key))
- self.assert_dicts_are_equal(img_recv['image'], r)
+ for key in ('', '50m3k3y'):
+ FR.json = dict(meta=img_recv['image']) if (
+ key) else dict(metadata=dict(values=img_recv['image']))
+ r = self.client.get_image_metadata(img_ref, key)
+ self.assertEqual(IG.mock_calls[-1], call(
+ '%s' % img_ref,
+ '/meta%s' % (('/%s' % key) if key else '')))
+ self.assert_dicts_are_equal(img_recv['image'], r)
@patch('%s.servers_delete' % compute_pkg, return_value=FR())
def test_delete_server(self, SD):
vm_id = vm_recv['server']['id']
self.client.delete_server(vm_id)
- self.assertEqual(SD.mock_calls[-1], call(vm_id))
+ SD.assert_called_once_with(vm_id)
@patch('%s.images_delete' % compute_pkg, return_value=FR())
def test_delete_image(self, ID):
self.client.delete_image(img_ref)
- self.assertEqual(ID.mock_calls[-1], call(img_ref))
+ ID.assert_called_once_with(img_ref)
@patch('%s.images_put' % compute_pkg, return_value=FR())
def test_create_image_metadata(self, IP):
(key, val) = ('k1', 'v1')
FR.json = dict(meta=img_recv['image'])
r = self.client.create_image_metadata(img_ref, key, val)
- self.assertEqual(IP.mock_calls[-1], call(
+ IP.assert_called_once_with(
img_ref, 'meta/%s' % key,
- json_data=dict(meta={key: val})))
+ json_data=dict(meta={key: val}))
self.assert_dicts_are_equal(r, img_recv['image'])
@patch('%s.images_post' % compute_pkg, return_value=FR())
metadata = dict(m1='v1', m2='v2', m3='v3')
FR.json = dict(metadata=metadata)
r = self.client.update_image_metadata(img_ref, **metadata)
- self.assertEqual(
- IP.mock_calls[-1],
- call(img_ref, 'meta', json_data=dict(metadata=metadata)))
+ IP.assert_called_once_with(
+ img_ref, 'meta',
+ json_data=dict(metadata=metadata))
self.assert_dicts_are_equal(r, metadata)
@patch('%s.images_delete' % compute_pkg, return_value=FR())
def test_delete_image_metadata(self, ID):
key = 'metakey'
self.client.delete_image_metadata(img_ref, key)
- self.assertEqual(ID.mock_calls[-1], call(img_ref, '/meta/%s' % key))
+ ID.assert_called_once_with(img_ref, '/meta/%s' % key)
+
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] == 'Compute':
+ not_found = False
+ runTestCase(Compute, 'Compute Client', argv[2:])
+ if not argv[1:] or argv[1] == 'ComputeRest':
+ not_found = False
+ runTestCase(ComputeRest, 'ComputeRest Client', argv[2:])
+ if not_found:
+ print('TestCase %s not found' % argv[1])
projects / kamaki / blobdiff