Revision b6403d2d kamaki/clients/compute/test.py
b/kamaki/clients/compute/test.py | ||
---|---|---|
143 | 143 |
ClientError, |
144 | 144 |
self.client.create_server, |
145 | 145 |
vm_name, fid, img_ref) |
146 |
self.assertEqual(GID.mock_calls[-1], call(img_ref)) |
|
147 | 146 |
|
148 | 147 |
with patch.object( |
149 | 148 |
CycladesClient, 'servers_post', |
... | ... | |
163 | 162 |
FR.json = vm_list |
164 | 163 |
for detail in (False, True): |
165 | 164 |
r = self.client.list_servers(detail) |
166 |
for i, vm in enumerate(vm_list['servers']['values']): |
|
167 |
self.assert_dicts_are_equal(r[i], vm) |
|
168 |
self.assertEqual(i + 1, len(r)) |
|
169 | 165 |
self.assertEqual(SG.mock_calls[-1], call( |
170 | 166 |
changes_since=None, |
171 | 167 |
command='detail' if detail else '')) |
168 |
for i, vm in enumerate(vm_list['servers']['values']): |
|
169 |
self.assert_dicts_are_equal(r[i], vm) |
|
170 |
self.assertEqual(i + 1, len(r)) |
|
172 | 171 |
|
173 | 172 |
@patch('%s.servers_get' % compute_pkg, return_value=FR()) |
174 | 173 |
def test_get_server_details(self, SG): |
175 | 174 |
vm_id = vm_recv['server']['id'] |
176 | 175 |
r = self.client.get_server_details(vm_id) |
176 |
SG.assert_called_once_with(vm_id) |
|
177 | 177 |
self.assert_dicts_are_equal(r, vm_recv['server']) |
178 |
self.assertEqual(SG.mock_calls[-1], call(vm_id)) |
|
179 | 178 |
|
180 | 179 |
@patch('%s.servers_put' % compute_pkg, return_value=FR()) |
181 | 180 |
def test_update_server_name(self, SP): |
182 | 181 |
vm_id = vm_recv['server']['id'] |
183 | 182 |
new_name = vm_name + '_new' |
184 | 183 |
self.client.update_server_name(vm_id, new_name) |
185 |
self.assertEqual(SP.mock_calls[-1], call(vm_id, json_data=dict(
|
|
186 |
server=dict(name=new_name))))
|
|
184 |
SP.assert_called_once_with(vm_id, json_data=dict(
|
|
185 |
server=dict(name=new_name))) |
|
187 | 186 |
|
188 | 187 |
@patch('%s.servers_post' % compute_pkg, return_value=FR()) |
189 | 188 |
def test_reboot_server(self, SP): |
... | ... | |
212 | 211 |
metadata = dict(m1='v1', m2='v2', m3='v3') |
213 | 212 |
FR.json = dict(metadata=dict(values=metadata)) |
214 | 213 |
r = self.client.get_server_metadata(vm_id) |
215 |
self.assertEqual(SG.mock_calls[-1], call(vm_id, '/meta'))
|
|
214 |
SG.assert_called_once_with(vm_id, '/meta')
|
|
216 | 215 |
self.assert_dicts_are_equal(r, metadata) |
217 | 216 |
|
218 | 217 |
for k, v in metadata.items(): |
... | ... | |
228 | 227 |
FR.json = dict(metadata=metadata) |
229 | 228 |
r = self.client.update_server_metadata(vm_id, **metadata) |
230 | 229 |
self.assert_dicts_are_equal(r, metadata) |
231 |
self.assertEqual(SP.mock_calls[-1], call(
|
|
230 |
SP.assert_called_once_with(
|
|
232 | 231 |
vm_id, 'meta', |
233 |
json_data=dict(metadata=metadata), success=201))
|
|
232 |
json_data=dict(metadata=metadata), success=201) |
|
234 | 233 |
|
235 | 234 |
@patch('%s.servers_delete' % compute_pkg, return_value=FR()) |
236 | 235 |
def test_delete_server_metadata(self, SD): |
237 | 236 |
vm_id = vm_recv['server']['id'] |
238 | 237 |
key = 'metakey' |
239 | 238 |
self.client.delete_server_metadata(vm_id, key) |
240 |
self.assertEqual(SD.mock_calls[-1], call(vm_id, 'meta/' + key))
|
|
239 |
SD.assert_called_once_with(vm_id, 'meta/' + key)
|
|
241 | 240 |
|
242 | 241 |
@patch('%s.flavors_get' % compute_pkg, return_value=FR()) |
243 | 242 |
def test_list_flavors(self, FG): |
... | ... | |
251 | 250 |
def test_get_flavor_details(self, FG): |
252 | 251 |
FR.json = dict(flavor=flavor_list['flavors']) |
253 | 252 |
r = self.client.get_flavor_details(fid) |
254 |
self.assertEqual(FG.mock_calls[-1], call(fid))
|
|
253 |
FG.assert_called_once_with(fid)
|
|
255 | 254 |
self.assert_dicts_are_equal(r, flavor_list['flavors']) |
256 | 255 |
|
257 | 256 |
@patch('%s.images_get' % compute_pkg, return_value=FR()) |
... | ... | |
268 | 267 |
def test_get_image_details(self, IG): |
269 | 268 |
FR.json = img_recv |
270 | 269 |
r = self.client.get_image_details(img_ref) |
271 |
self.assertEqual(IG.mock_calls[-1], call(img_ref))
|
|
270 |
IG.assert_called_once_with(img_ref)
|
|
272 | 271 |
self.assert_dicts_are_equal(r, img_recv['image']) |
273 | 272 |
|
274 | 273 |
@patch('%s.images_get' % compute_pkg, return_value=FR()) |
275 | 274 |
def test_get_image_metadata(self, IG): |
276 |
FR.json = dict(metadata=dict(values=img_recv['image'])) |
|
277 |
r = self.client.get_image_metadata(img_ref) |
|
278 |
self.assertEqual(IG.mock_calls[-1], call('%s' % img_ref, '/meta')) |
|
279 |
self.assert_dicts_are_equal(img_recv['image'], r) |
|
280 |
FR.json = dict(meta=img_recv['image']) |
|
281 |
key = 'somekey' |
|
282 |
r = self.client.get_image_metadata(img_ref, key) |
|
283 |
self.assertEqual( |
|
284 |
IG.mock_calls[-1], |
|
285 |
call('%s' % img_ref, '/meta/%s' % key)) |
|
286 |
self.assert_dicts_are_equal(img_recv['image'], r) |
|
275 |
for key in ('', '50m3k3y'): |
|
276 |
FR.json = dict(meta=img_recv['image']) if ( |
|
277 |
key) else dict(metadata=dict(values=img_recv['image'])) |
|
278 |
r = self.client.get_image_metadata(img_ref, key) |
|
279 |
self.assertEqual(IG.mock_calls[-1], call( |
|
280 |
'%s' % img_ref, |
|
281 |
'/meta%s' % (('/%s' % key) if key else ''))) |
|
282 |
self.assert_dicts_are_equal(img_recv['image'], r) |
|
287 | 283 |
|
288 | 284 |
@patch('%s.servers_delete' % compute_pkg, return_value=FR()) |
289 | 285 |
def test_delete_server(self, SD): |
Also available in: Unified diff