Revision 4b3b8688 snf-cyclades-app/synnefo/api/images.py
b/snf-cyclades-app/synnefo/api/images.py | ||
---|---|---|
114 | 114 |
# overLimit (413) |
115 | 115 |
|
116 | 116 |
log.debug('list_images detail=%s', detail) |
117 |
backend = ImageBackend(request.user) |
|
117 |
backend = ImageBackend(request.user_uniq)
|
|
118 | 118 |
|
119 | 119 |
since = isoparse(request.GET.get('changes-since')) |
120 | 120 |
if since: |
... | ... | |
168 | 168 |
# overLimit (413) |
169 | 169 |
|
170 | 170 |
log.debug('get_image_details %s', image_id) |
171 |
image = util.get_image(image_id, request.user) |
|
171 |
image = util.get_image(image_id, request.user_uniq)
|
|
172 | 172 |
reply = image_to_dict(image) |
173 | 173 |
|
174 | 174 |
if request.serialization == 'xml': |
... | ... | |
189 | 189 |
# overLimit (413) |
190 | 190 |
|
191 | 191 |
log.debug('delete_image %s', image_id) |
192 |
backend = ImageBackend(request.user) |
|
192 |
backend = ImageBackend(request.user_uniq)
|
|
193 | 193 |
backend.delete(image_id) |
194 | 194 |
backend.close() |
195 |
log.info('User %s deleted image %s', request.user, image_id) |
|
195 |
log.info('User %s deleted image %s', request.user_uniq, image_id)
|
|
196 | 196 |
return HttpResponse(status=204) |
197 | 197 |
|
198 | 198 |
|
... | ... | |
206 | 206 |
# overLimit (413) |
207 | 207 |
|
208 | 208 |
log.debug('list_image_metadata %s', image_id) |
209 |
image = util.get_image(image_id, request.user) |
|
209 |
image = util.get_image(image_id, request.user_uniq)
|
|
210 | 210 |
metadata = image['properties'] |
211 | 211 |
return util.render_metadata(request, metadata, use_values=True, status=200) |
212 | 212 |
|
... | ... | |
224 | 224 |
|
225 | 225 |
req = util.get_request_dict(request) |
226 | 226 |
log.debug('update_image_metadata %s %s', image_id, req) |
227 |
image = util.get_image(image_id, request.user) |
|
227 |
image = util.get_image(image_id, request.user_uniq)
|
|
228 | 228 |
try: |
229 | 229 |
metadata = req['metadata'] |
230 | 230 |
assert isinstance(metadata, dict) |
... | ... | |
234 | 234 |
properties = image['properties'] |
235 | 235 |
properties.update(metadata) |
236 | 236 |
|
237 |
backend = ImageBackend(request.user) |
|
237 |
backend = ImageBackend(request.user_uniq)
|
|
238 | 238 |
backend.update(image_id, dict(properties=properties)) |
239 | 239 |
backend.close() |
240 | 240 |
|
... | ... | |
252 | 252 |
# overLimit (413) |
253 | 253 |
|
254 | 254 |
log.debug('get_image_metadata_item %s %s', image_id, key) |
255 |
image = util.get_image(image_id, request.user) |
|
255 |
image = util.get_image(image_id, request.user_uniq)
|
|
256 | 256 |
val = image['properties'].get(key) |
257 | 257 |
if val is None: |
258 | 258 |
raise ItemNotFound('Metadata key not found.') |
... | ... | |
282 | 282 |
raise BadRequest('Malformed request.') |
283 | 283 |
|
284 | 284 |
val = metadict[key] |
285 |
image = util.get_image(image_id, request.user) |
|
285 |
image = util.get_image(image_id, request.user_uniq)
|
|
286 | 286 |
properties = image['properties'] |
287 | 287 |
properties[key] = val |
288 | 288 |
|
289 |
backend = ImageBackend(request.user) |
|
289 |
backend = ImageBackend(request.user_uniq)
|
|
290 | 290 |
backend.update(image_id, dict(properties=properties)) |
291 | 291 |
backend.close() |
292 | 292 |
|
... | ... | |
306 | 306 |
# overLimit (413), |
307 | 307 |
|
308 | 308 |
log.debug('delete_image_metadata_item %s %s', image_id, key) |
309 |
image = util.get_image(image_id, request.user) |
|
309 |
image = util.get_image(image_id, request.user_uniq)
|
|
310 | 310 |
properties = image['properties'] |
311 | 311 |
properties.pop(key, None) |
312 | 312 |
|
313 |
backend = ImageBackend(request.user) |
|
313 |
backend = ImageBackend(request.user_uniq)
|
|
314 | 314 |
backend.update(image_id, dict(properties=properties)) |
315 | 315 |
backend.close() |
316 | 316 |
|
Also available in: Unified diff