Revision 23808592 snf-cyclades-app/synnefo/api/tests/images.py
b/snf-cyclades-app/synnefo/api/tests/images.py | ||
---|---|---|
42 | 42 |
from mock import patch |
43 | 43 |
from functools import wraps |
44 | 44 |
|
45 |
compute_path = get_service_path(cyclades_services, 'compute', |
|
46 |
version='v2.0') |
|
47 |
IMAGES_URL = join_urls(compute_path, "images/") |
|
48 |
|
|
45 | 49 |
|
46 | 50 |
def assert_backend_closed(func): |
47 |
"""Decorator for ensuring that ImageBackend is returned to pool."""
|
|
51 |
"""Decorator for ensuring that PlanktonBackend is returned to pool."""
|
|
48 | 52 |
@wraps(func) |
49 | 53 |
def wrapper(self, backend): |
50 | 54 |
result = func(self, backend) |
... | ... | |
54 | 58 |
return wrapper |
55 | 59 |
|
56 | 60 |
|
57 |
class ComputeAPITest(BaseAPITest): |
|
58 |
def setUp(self, *args, **kwargs): |
|
59 |
super(ComputeAPITest, self).setUp(*args, **kwargs) |
|
60 |
self.compute_path = get_service_path(cyclades_services, 'compute', |
|
61 |
version='v2.0') |
|
62 |
def myget(self, path, *args, **kwargs): |
|
63 |
path = join_urls(self.compute_path, path) |
|
64 |
return self.get(path, *args, **kwargs) |
|
65 |
|
|
66 |
def myput(self, path, *args, **kwargs): |
|
67 |
path = join_urls(self.compute_path, path) |
|
68 |
return self.put(path, *args, **kwargs) |
|
69 |
|
|
70 |
def mypost(self, path, *args, **kwargs): |
|
71 |
path = join_urls(self.compute_path, path) |
|
72 |
return self.post(path, *args, **kwargs) |
|
73 |
|
|
74 |
def mydelete(self, path, *args, **kwargs): |
|
75 |
path = join_urls(self.compute_path, path) |
|
76 |
return self.delete(path, *args, **kwargs) |
|
77 |
|
|
78 |
|
|
79 |
@patch('synnefo.plankton.backend.ImageBackend') |
|
80 |
class ImageAPITest(ComputeAPITest): |
|
61 |
@patch('synnefo.plankton.backend.PlanktonBackend') |
|
62 |
class ImageAPITest(BaseAPITest): |
|
81 | 63 |
@assert_backend_closed |
82 | 64 |
def test_create_image(self, mimage): |
83 | 65 |
"""Test that create image is not implemented""" |
84 |
response = self.mypost('images/', 'user', json.dumps(''), 'json')
|
|
66 |
response = self.post(IMAGES_URL, 'user', json.dumps(''), 'json')
|
|
85 | 67 |
self.assertEqual(response.status_code, 501) |
86 | 68 |
|
87 | 69 |
@assert_backend_closed |
... | ... | |
90 | 72 |
images = [{'id': 1, 'name': 'image-1'}, |
91 | 73 |
{'id': 2, 'name': 'image-2'}, |
92 | 74 |
{'id': 3, 'name': 'image-3'}] |
93 |
mimage().list_images.return_value = images |
|
94 |
response = self.myget('images', 'user')
|
|
75 |
mimage().__enter__().list_images.return_value = images
|
|
76 |
response = self.get(IMAGES_URL, 'user')
|
|
95 | 77 |
self.assertSuccess(response) |
96 | 78 |
api_images = json.loads(response.content)['images'] |
97 | 79 |
self.assertEqual(images, api_images) |
... | ... | |
150 | 132 |
'created': '2012-11-26T11:52:54+00:00', |
151 | 133 |
'updated': '2012-12-26T11:52:54+00:00', |
152 | 134 |
'metadata': {}}] |
153 |
mimage().list_images.return_value = images |
|
154 |
response = self.myget('images/detail', 'user')
|
|
135 |
mimage().__enter__().list_images.return_value = images
|
|
136 |
response = self.get(join_urls(IMAGES_URL, "detail"), 'user')
|
|
155 | 137 |
self.assertSuccess(response) |
156 | 138 |
api_images = json.loads(response.content)['images'] |
157 | 139 |
self.assertEqual(len(result_images), len(api_images)) |
... | ... | |
184 | 166 |
'updated_at': new_time.isoformat(), |
185 | 167 |
'deleted_at': new_time.isoformat(), |
186 | 168 |
'properties': ''}] |
187 |
mimage().list_images.return_value = images |
|
169 |
mimage().__enter__().list_images.return_value = images
|
|
188 | 170 |
response =\ |
189 |
self.myget('images/detail?changes-since=%sUTC' % new_time) |
|
171 |
self.get(join_urls(IMAGES_URL, 'detail?changes-since=%sUTC' % |
|
172 |
new_time)) |
|
190 | 173 |
self.assertSuccess(response) |
191 | 174 |
api_images = json.loads(response.content)['images'] |
192 | 175 |
self.assertEqual(1, len(api_images)) |
... | ... | |
211 | 194 |
'user_id': 'user1', |
212 | 195 |
'tenant_id': 'user1', |
213 | 196 |
'metadata': {'foo': 'bar'}} |
214 |
mimage.return_value.get_image.return_value = image
|
|
215 |
response = self.myget('images/42', 'user')
|
|
197 |
mimage().__enter__().get_image.return_value = image
|
|
198 |
response = self.get(join_urls(IMAGES_URL, "42"), 'user')
|
|
216 | 199 |
self.assertSuccess(response) |
217 | 200 |
api_image = json.loads(response.content)['image'] |
218 | 201 |
api_image.pop("links") |
219 | 202 |
self.assertEqual(api_image, result_image) |
220 | 203 |
|
221 |
@assert_backend_closed |
|
222 | 204 |
def test_invalid_image(self, mimage): |
223 |
mimage.return_value.get_image.side_effect = faults.ItemNotFound('Image not found') |
|
224 |
response = self.myget('images/42', 'user') |
|
205 |
mimage().__enter__().get_image.side_effect = \ |
|
206 |
faults.ItemNotFound('Image not found') |
|
207 |
response = self.get(join_urls(IMAGES_URL, "42"), 'user') |
|
225 | 208 |
self.assertItemNotFound(response) |
226 | 209 |
|
227 | 210 |
@assert_backend_closed |
228 | 211 |
def test_delete_image(self, mimage): |
229 |
response = self.mydelete("images/42", "user")
|
|
212 |
response = self.delete(join_urls(IMAGES_URL, "42"), 'user')
|
|
230 | 213 |
self.assertEqual(response.status_code, 204) |
231 |
mimage.return_value.unregister.assert_called_once_with('42') |
|
232 |
mimage.return_value._delete.assert_not_called('42') |
|
214 |
mimage().__enter__().unregister.assert_called_once_with('42') |
|
233 | 215 |
|
234 | 216 |
@assert_backend_closed |
235 | 217 |
def test_catch_wrong_api_paths(self, *args): |
236 |
response = self.myget('nonexistent')
|
|
218 |
response = self.get(join_urls(IMAGES_URL, 'nonexistent/lala/foo'))
|
|
237 | 219 |
self.assertEqual(response.status_code, 400) |
238 | 220 |
try: |
239 | 221 |
error = json.loads(response.content) |
... | ... | |
243 | 225 |
@assert_backend_closed |
244 | 226 |
def test_method_not_allowed(self, *args): |
245 | 227 |
# /images/ allows only POST, GET |
246 |
response = self.myput('images', '', '')
|
|
228 |
response = self.put(IMAGES_URL, '', '')
|
|
247 | 229 |
self.assertMethodNotAllowed(response) |
248 |
response = self.mydelete('images')
|
|
230 |
response = self.delete(IMAGES_URL, '')
|
|
249 | 231 |
self.assertMethodNotAllowed(response) |
250 | 232 |
|
251 | 233 |
# /images/<imgid>/ allows only GET, DELETE |
252 |
response = self.mypost("images/42") |
|
253 |
self.assertMethodNotAllowed(response) |
|
254 |
response = self.myput('images/42', '', '') |
|
255 |
self.assertMethodNotAllowed(response) |
|
256 |
|
|
257 |
# /images/<imgid>/metadata/ allows only POST, GET |
|
258 |
response = self.myput('images/42/metadata', '', '') |
|
234 |
response = self.post(join_urls(IMAGES_URL, "42"), 'user') |
|
259 | 235 |
self.assertMethodNotAllowed(response) |
260 |
response = self.mydelete('images/42/metadata')
|
|
236 |
response = self.put(join_urls(IMAGES_URL, "42"), 'user')
|
|
261 | 237 |
self.assertMethodNotAllowed(response) |
262 | 238 |
|
263 | 239 |
# /images/<imgid>/metadata/ allows only POST, GET |
264 |
response = self.myput('images/42/metadata', '', '')
|
|
240 |
response = self.put(join_urls(IMAGES_URL, "42", "metadata"), 'user')
|
|
265 | 241 |
self.assertMethodNotAllowed(response) |
266 |
response = self.mydelete('images/42/metadata')
|
|
242 |
response = self.delete(join_urls(IMAGES_URL, "42", "metadata"), 'user')
|
|
267 | 243 |
self.assertMethodNotAllowed(response) |
268 | 244 |
|
269 | 245 |
# /images/<imgid>/metadata/<key> allows only PUT, GET, DELETE |
270 |
response = self.mypost('images/42/metadata/foo') |
|
246 |
response = self.post(join_urls(IMAGES_URL, "42", "metadata", "foo"), |
|
247 |
'user') |
|
271 | 248 |
self.assertMethodNotAllowed(response) |
272 | 249 |
|
273 | 250 |
|
274 |
@patch('synnefo.plankton.backend.ImageBackend')
|
|
275 |
class ImageMetadataAPITest(ComputeAPITest):
|
|
251 |
@patch('synnefo.plankton.backend.PlanktonBackend')
|
|
252 |
class ImageMetadataAPITest(BaseAPITest):
|
|
276 | 253 |
def setUp(self): |
277 | 254 |
self.image = {'id': 42, |
278 | 255 |
'name': 'image-1', |
... | ... | |
293 | 270 |
|
294 | 271 |
@assert_backend_closed |
295 | 272 |
def test_list_metadata(self, backend): |
296 |
backend.return_value.get_image.return_value = self.image
|
|
297 |
response = self.myget('images/42/metadata', 'user')
|
|
273 |
backend().__enter__().get_image.return_value = self.image
|
|
274 |
response = self.get(join_urls(IMAGES_URL, '42/metadata'), 'user')
|
|
298 | 275 |
self.assertSuccess(response) |
299 | 276 |
meta = json.loads(response.content)['metadata'] |
300 | 277 |
self.assertEqual(meta, self.image['properties']) |
301 | 278 |
|
302 | 279 |
@assert_backend_closed |
303 | 280 |
def test_get_metadata(self, backend): |
304 |
backend.return_value.get_image.return_value = self.image
|
|
305 |
response = self.myget('images/42/metadata/foo', 'user')
|
|
281 |
backend().__enter__().get_image.return_value = self.image
|
|
282 |
response = self.get(join_urls(IMAGES_URL, '42/metadata/foo'), 'user')
|
|
306 | 283 |
self.assertSuccess(response) |
307 | 284 |
meta = json.loads(response.content)['meta'] |
308 | 285 |
self.assertEqual(meta['foo'], 'bar') |
309 | 286 |
|
310 | 287 |
@assert_backend_closed |
311 | 288 |
def test_get_invalid_metadata(self, backend): |
312 |
backend.return_value.get_image.return_value = self.image |
|
313 |
response = self.myget('images/42/metadata/not_found', 'user') |
|
289 |
backend().__enter__().get_image.return_value = self.image |
|
290 |
response = self.get(join_urls(IMAGES_URL, '42/metadata/not_found'), |
|
291 |
'user') |
|
314 | 292 |
self.assertItemNotFound(response) |
315 | 293 |
|
316 | 294 |
def test_delete_metadata_item(self, backend): |
317 |
backend.return_value.get_image.return_value = self.image |
|
318 |
response = self.mydelete('images/42/metadata/foo', 'user') |
|
295 |
backend().__enter__().get_image.return_value = self.image |
|
296 |
response = self.delete(join_urls(IMAGES_URL, '42/metadata/foo'), |
|
297 |
'user') |
|
319 | 298 |
self.assertEqual(response.status_code, 204) |
320 |
backend.return_value.update_metadata.assert_called_once_with('42', {'properties': {'foo2':
|
|
321 |
'bar2'}})
|
|
299 |
backend().__enter__().update_metadata\
|
|
300 |
.assert_called_once_with('42', {'properties': {'foo2': 'bar2'}})
|
|
322 | 301 |
|
323 | 302 |
@assert_backend_closed |
324 | 303 |
def test_create_metadata_item(self, backend): |
325 |
backend.return_value.get_image.return_value = self.image
|
|
304 |
backend().__enter__().get_image.return_value = self.image
|
|
326 | 305 |
request = {'meta': {'foo3': 'bar3'}} |
327 |
response = self.myput('images/42/metadata/foo3', 'user',
|
|
328 |
json.dumps(request), 'json')
|
|
306 |
response = self.put(join_urls(IMAGES_URL, '42/metadata/foo3'), 'user',
|
|
307 |
json.dumps(request), 'json') |
|
329 | 308 |
self.assertEqual(response.status_code, 201) |
330 |
backend.return_value.update_metadata.assert_called_once_with('42',
|
|
309 |
backend().__enter__().update_metadata.assert_called_once_with('42',
|
|
331 | 310 |
{'properties': |
332 | 311 |
{'foo': 'bar', 'foo2': 'bar2', 'foo3': 'bar3'}}) |
333 | 312 |
|
334 | 313 |
@assert_backend_closed |
335 | 314 |
def test_create_metadata_malformed_1(self, backend): |
336 |
backend.return_value.get_image.return_value = self.image
|
|
315 |
backend().__enter__().get_image.return_value = self.image
|
|
337 | 316 |
request = {'met': {'foo3': 'bar3'}} |
338 |
response = self.myput('images/42/metadata/foo3', 'user',
|
|
339 |
json.dumps(request), 'json')
|
|
317 |
response = self.put(join_urls(IMAGES_URL, '42/metadata/foo3'), 'user',
|
|
318 |
json.dumps(request), 'json') |
|
340 | 319 |
self.assertBadRequest(response) |
341 | 320 |
|
342 | 321 |
@assert_backend_closed |
343 | 322 |
def test_create_metadata_malformed_2(self, backend): |
344 |
backend.return_value.get_image.return_value = self.image
|
|
323 |
backend().__enter__().get_image.return_value = self.image
|
|
345 | 324 |
request = {'metadata': [('foo3', 'bar3')]} |
346 |
response = self.myput('images/42/metadata/foo3', 'user',
|
|
347 |
json.dumps(request), 'json')
|
|
325 |
response = self.put(join_urls(IMAGES_URL, '42/metadata/foo3'), 'user',
|
|
326 |
json.dumps(request), 'json') |
|
348 | 327 |
self.assertBadRequest(response) |
349 | 328 |
|
350 | 329 |
@assert_backend_closed |
351 | 330 |
def test_create_metadata_malformed_3(self, backend): |
352 |
backend.return_value.get_image.return_value = self.image
|
|
331 |
backend().__enter__().get_image.return_value = self.image
|
|
353 | 332 |
request = {'met': {'foo3': 'bar3', 'foo4': 'bar4'}} |
354 |
response = self.myput('images/42/metadata/foo3', 'user',
|
|
355 |
json.dumps(request), 'json')
|
|
333 |
response = self.put(join_urls(IMAGES_URL, '42/metadata/foo3'), 'user',
|
|
334 |
json.dumps(request), 'json') |
|
356 | 335 |
self.assertBadRequest(response) |
357 | 336 |
|
358 | 337 |
@assert_backend_closed |
359 | 338 |
def test_create_metadata_malformed_4(self, backend): |
360 |
backend.return_value.get_image.return_value = self.image
|
|
339 |
backend().__enter__().get_image.return_value = self.image
|
|
361 | 340 |
request = {'met': {'foo3': 'bar3'}} |
362 |
response = self.myput('images/42/metadata/foo4', 'user',
|
|
363 |
json.dumps(request), 'json')
|
|
341 |
response = self.put(join_urls(IMAGES_URL, '42/metadata/foo4'), 'user',
|
|
342 |
json.dumps(request), 'json') |
|
364 | 343 |
self.assertBadRequest(response) |
365 | 344 |
|
366 | 345 |
@assert_backend_closed |
367 | 346 |
def test_update_metadata_item(self, backend): |
368 |
backend.return_value.get_image.return_value = self.image
|
|
347 |
backend().__enter__().get_image.return_value = self.image
|
|
369 | 348 |
request = {'metadata': {'foo': 'bar_new', 'foo4': 'bar4'}} |
370 |
response = self.mypost('images/42/metadata', 'user',
|
|
371 |
json.dumps(request), 'json')
|
|
349 |
response = self.post(join_urls(IMAGES_URL, '42/metadata'), 'user',
|
|
350 |
json.dumps(request), 'json') |
|
372 | 351 |
self.assertEqual(response.status_code, 201) |
373 |
backend.return_value.update_metadata.assert_called_once_with('42',
|
|
352 |
backend().__enter__().update_metadata.assert_called_once_with('42',
|
|
374 | 353 |
{'properties': |
375 | 354 |
{'foo': 'bar_new', 'foo2': 'bar2', 'foo4': 'bar4'} |
376 | 355 |
}) |
377 | 356 |
|
378 | 357 |
@assert_backend_closed |
379 | 358 |
def test_update_metadata_malformed(self, backend): |
380 |
backend.return_value.get_image.return_value = self.image
|
|
359 |
backend().__enter__().get_image.return_value = self.image
|
|
381 | 360 |
request = {'meta': {'foo': 'bar_new', 'foo4': 'bar4'}} |
382 |
response = self.mypost('images/42/metadata', 'user',
|
|
383 |
json.dumps(request), 'json')
|
|
361 |
response = self.post(join_urls(IMAGES_URL, '42/metadata'), 'user',
|
|
362 |
json.dumps(request), 'json') |
|
384 | 363 |
self.assertBadRequest(response) |
Also available in: Unified diff