# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
-from mock import patch, Mock, call
+from mock import patch, call
from unittest import TestCase
-from json import loads
+from itertools import product
+from json import dumps
-from kamaki.clients import Client, ClientError
-from kamaki.clients.cyclades import CycladesClient
-from kamaki.clients.cyclades_rest_api import CycladesClientApi
+from kamaki.clients.compute import ComputeClient, ComputeRestClient
+from kamaki.clients import ClientError
-compute_pkg_pkg = 'kamaki.clients.connection.kamakicon.KamakiHTTPConnection'
-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"
dict(name='n1', id=1),
dict(name='n2', id=2)]))
flavor_list = dict(flavors=dict(values=[
- dict(id=41, name="C1R1024D20"),
- dict(id=42, name="C1R1024D40"),
- dict(id=43, name="C1R1028D20")]))
+ dict(id=41, name="C1R1024D20"),
+ dict(id=42, name="C1R1024D40"),
+ dict(id=43, name="C1R1028D20")]))
img_list = dict(images=dict(values=[
dict(name="maelstrom", id="0fb03e45-7d5a-4515-bd4e-e6bbf6457f06"),
dict(name="edx_saas", id="1357163d-5fd8-488e-a117-48734c526206"),
dict(name="Ubuntu 12.10", id="3a24fef9-1a8c-47d1-8f11-e07bd5e544fd"),
dict(name="Debian Base", id="40ace203-6254-4e17-a5cb-518d55418a7d"),
dict(name="ubuntu_bundled", id="5336e265-5c7c-4127-95cb-2bf832a79903")]))
-net_send = dict(network=dict(dhcp=False, name='someNet'))
-net_recv = dict(network=dict(
- status="PENDING",
- updated="2013-03-05T15:04:51.758780+00:00",
- name="someNet",
- created="2013-03-05T15:04:51.758728+00:00",
- cidr6=None,
- id="2130",
- gateway6=None,
- public=False,
- dhcp=False,
- 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=[
- dict(id=1, name='n1'),
- dict(id=2, name='n2'),
- dict(id=3, name='n3')]))
class FR(object):
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)
-
- """
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_shutdown_server(self, PR):
- vm_id = vm_recv['server']['id']
- FR.status_code = 202
- self.client.shutdown_server(vm_id)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/servers/%s/action' % vm_id)
- self.assertEqual(
- PR.call_args[0],
- ('post', '{"shutdown": {}}', {}, {}))
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_start_server(self, PR):
- vm_id = vm_recv['server']['id']
- FR.status_code = 202
- self.client.start_server(vm_id)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/servers/%s/action' % vm_id)
- self.assertEqual(PR.call_args[0], ('post', '{"start": {}}', {}, {}))
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_get_server_console(self, PR):
- 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)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/servers/%s/action' % vm_id)
- self.assert_dicts_are_equal(cnsl['console'], r)
- self.assertEqual(
- PR.call_args[0],
- ('post', '{"console": {"type": "vnc"}}', {}, {}))
-
- def test_get_firewall_profile(self):
- vm_id = vm_recv['server']['id']
- v = 'Some profile'
- ret = {'attachments': {'values': [{'firewallProfile': v, 1:1}]}}
- with patch.object(
- CycladesClient,
- 'get_server_details',
- return_value=ret) as GSD:
- r = self.client.get_firewall_profile(vm_id)
- self.assertEqual(r, v)
- self.assertEqual(GSD.call_args[0], (vm_id,))
- ret['attachments']['values'][0].pop('firewallProfile')
- self.assertRaises(
- ClientError,
- self.client.get_firewall_profile,
- vm_id)
+ 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.perform_request' % compute_pkg, return_value=FR())
- def test_set_firewall_profile(self, PR):
- vm_id = vm_recv['server']['id']
- v = 'Some profile'
- FR.status_code = 202
- self.client.set_firewall_profile(vm_id, v)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/servers/%s/action' % vm_id)
- self.assertEqual(PR.call_args[0], (
- 'post',
- '{"firewallProfile": {"profile": "%s"}}' % v,
- {},
- {}))
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_get_server_stats(self, PR):
- 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)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/servers/%s/stats' % vm_id)
- self.assert_dicts_are_equal(stats, r)
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_create_network(self, PR):
- net_name = net_send['network']['name']
- FR.json = net_recv
- FR.status_code = 202
- 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))
- for arg, val in test_args.items():
- kwargs = {} if arg == 'empty' else full_args if (
- arg == 'full') else {arg: val}
- r = self.client.create_network(net_name, **kwargs)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/networks')
- self.assert_dicts_are_equal(r, net_recv['network'])
- data = PR.call_args[0][1]
- expected = dict(network=dict(net_send['network']))
- expected['network'].update(kwargs)
- self.assert_dicts_are_equal(loads(data), expected)
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_connect_server(self, PR):
- vm_id = vm_recv['server']['id']
- net_id = net_recv['network']['id']
- FR.status_code = 202
- self.client.connect_server(vm_id, net_id)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/networks/%s/action' % net_id)
- self.assertEqual(
- PR.call_args[0],
- ('post', '{"add": {"serverRef": %s}}' % vm_id, {}, {}))
-
- @patch('%s.networks_post' % compute_pkg, return_value=FR())
- def test_disconnect_server(self, NP):
- vm_id = vm_recv['server']['id']
- net_id = net_recv['network']['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)
- self.assertEqual(r, 1)
- self.assertEqual(LSN.call_args[0], (vm_id,))
- self.assertEqual(NP.call_args[0], (net_id, 'action'))
- self.assertEqual(
- NP.call_args[1],
- dict(json_data=dict(remove=dict(attachment=nic_id))))
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_list_server_nics(self, PR):
- 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)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/servers/%s/ips' % vm_id)
- expected = nics['addresses']['values']
- for i in range(len(r)):
- self.assert_dicts_are_equal(r[i], expected[i])
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_list_networks(self, PR):
- FR.json = net_list
- r = self.client.list_networks()
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(self.client.http_client.path, '/networks')
- expected = net_list['networks']['values']
- for i in range(len(r)):
- self.assert_dicts_are_equal(expected[i], r[i])
- self.client.list_networks(detail=True)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(self.client.http_client.path, '/networks/detail')
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_list_network_nics(self, PR):
- net_id = net_recv['network']['id']
- FR.json = net_recv
- r = self.client.list_network_nics(net_id)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/networks/%s' % 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' % compute_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.perform_request' % compute_pkg, return_value=FR())
- def test_get_network_details(self, PR):
- FR.json = net_recv
- net_id = net_recv['network']['id']
- r = self.client.get_network_details(net_id)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/networks/%s' % net_id)
- self.assert_dicts_are_equal(r, net_recv['network'])
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_update_network_name(self, PR):
- net_id = net_recv['network']['id']
- new_name = '%s_new' % net_id
- FR.status_code = 204
- self.client.update_network_name(net_id, new_name)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(self.client.http_client.path, '/networks/%s' % net_id)
- (method, data, a_headers, a_params) = PR.call_args[0]
- self.assert_dicts_are_equal(
- dict(network=dict(name=new_name)),
- loads(data))
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_delete_server(self, PR):
+ @patch('%s.servers_delete' % compute_pkg, return_value=FR())
+ def test_delete_server(self, SD):
vm_id = vm_recv['server']['id']
- FR.status_code = 204
self.client.delete_server(vm_id)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(self.client.http_client.path, '/servers/%s' % vm_id)
+ SD.assert_called_once_with(vm_id)
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_delete_image(self, PR):
- FR.status_code = 204
+ @patch('%s.images_delete' % compute_pkg, return_value=FR())
+ def test_delete_image(self, ID):
self.client.delete_image(img_ref)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(self.client.http_client.path, '/images/%s' % img_ref)
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_delete_network(self, PR):
- net_id = net_recv['network']['id']
- FR.status_code = 204
- self.client.delete_network(net_id)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(self.client.http_client.path, '/networks/%s' % net_id)
-
- @patch('%s.perform_request' % compute_pkg, return_value=FR())
- def test_create_image_metadata(self, PR):
- metadata = dict(m1='v1', m2='v2', m3='v3')
+ 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'])
- self.assertRaises(
- ClientError,
- self.client.create_image_metadata,
- img_ref, 'key', 'value')
- FR.status_code = 201
- for k, v in metadata.items():
- r = self.client.create_image_metadata(img_ref, k, v)
- self.assertEqual(self.client.http_client.url, self.url)
- self.assertEqual(
- self.client.http_client.path,
- '/images/%s/meta/%s' % (img_ref, k))
- (method, data, a_headers, a_params) = PR.call_args[0]
- self.assertEqual(dict(meta={k: v}), loads(data))
- self.assert_dicts_are_equal(r, img_recv['image'])
+ r = self.client.create_image_metadata(img_ref, key, val)
+ IP.assert_called_once_with(
+ img_ref, 'meta/%s' % key,
+ json_data=dict(meta={key: val}))
+ self.assert_dicts_are_equal(r, img_recv['image'])
@patch('%s.images_post' % compute_pkg, return_value=FR())
- def test_update_image_metadata(self, images_post):
+ def test_update_image_metadata(self, IP):
metadata = dict(m1='v1', m2='v2', m3='v3')
FR.json = dict(metadata=metadata)
r = self.client.update_image_metadata(img_ref, **metadata)
+ IP.assert_called_once_with(
+ img_ref, 'meta',
+ json_data=dict(metadata=metadata))
self.assert_dicts_are_equal(r, metadata)
- (called_id, cmd) = images_post.call_args[0]
- self.assertEqual(called_id, img_ref)
- self.assertEqual(cmd, 'meta')
- data = images_post.call_args[1]['json_data']
- self.assert_dicts_are_equal(data, dict(metadata=metadata))
@patch('%s.images_delete' % compute_pkg, return_value=FR())
- def test_delete_image_metadata(self, images_delete):
+ def test_delete_image_metadata(self, ID):
key = 'metakey'
self.client.delete_image_metadata(img_ref, key)
- self.assertEqual(
- (img_ref, '/meta/' + key),
- images_delete.call_args[0])
- """
+ 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