Revision e440e835 snf-cyclades-app/synnefo/api/images.py
b/snf-cyclades-app/synnefo/api/images.py | ||
---|---|---|
51 | 51 |
|
52 | 52 |
log = getLogger('synnefo.api') |
53 | 53 |
|
54 |
urlpatterns = patterns('synnefo.api.images', |
|
54 |
urlpatterns = patterns( |
|
55 |
'synnefo.api.images', |
|
55 | 56 |
(r'^(?:/|.json|.xml)?$', 'demux'), |
56 | 57 |
(r'^/detail(?:.json|.xml)?$', 'list_images', {'detail': True}), |
57 | 58 |
(r'^/([\w-]+)(?:.json|.xml)?$', 'image_demux'), |
... | ... | |
59 | 60 |
(r'^/([\w-]+)/meta/(.+?)(?:.json|.xml)?$', 'metadata_item_demux') |
60 | 61 |
) |
61 | 62 |
|
63 |
|
|
62 | 64 |
def demux(request): |
63 | 65 |
if request.method == 'GET': |
64 | 66 |
return list_images(request) |
... | ... | |
67 | 69 |
else: |
68 | 70 |
return method_not_allowed(request) |
69 | 71 |
|
72 |
|
|
70 | 73 |
def image_demux(request, image_id): |
71 | 74 |
if request.method == 'GET': |
72 | 75 |
return get_image_details(request, image_id) |
... | ... | |
75 | 78 |
else: |
76 | 79 |
return method_not_allowed(request) |
77 | 80 |
|
81 |
|
|
78 | 82 |
def metadata_demux(request, image_id): |
79 | 83 |
if request.method == 'GET': |
80 | 84 |
return list_metadata(request, image_id) |
... | ... | |
83 | 87 |
else: |
84 | 88 |
return method_not_allowed(request) |
85 | 89 |
|
90 |
|
|
86 | 91 |
def metadata_item_demux(request, image_id, key): |
87 | 92 |
if request.method == 'GET': |
88 | 93 |
return get_metadata_item(request, image_id, key) |
... | ... | |
114 | 119 |
finally: |
115 | 120 |
backend.close() |
116 | 121 |
|
122 |
|
|
117 | 123 |
@api_method('GET') |
118 | 124 |
def list_images(request, detail=False): |
119 | 125 |
# Normal Response Codes: 200, 203 |
Also available in: Unified diff