Revision ec6f741b snf-pithos-app/pithos/api/functions.py
b/snf-pithos-app/pithos/api/functions.py | ||
---|---|---|
56 | 56 |
get_content_range, socket_read_iterator, SaveToBackendHandler, |
57 | 57 |
object_data_response, put_object_block, hashmap_md5, simple_list_response, |
58 | 58 |
api_method, is_uuid, retrieve_uuid, retrieve_uuids, |
59 |
retrieve_displaynames, get_pithos_usage, Checksum, NoChecksum
|
|
59 |
retrieve_displaynames, Checksum, NoChecksum |
|
60 | 60 |
) |
61 | 61 |
|
62 | 62 |
from pithos.api.settings import (UPDATE_MD5, TRANSLATE_UUIDS, |
... | ... | |
240 | 240 |
return response |
241 | 241 |
|
242 | 242 |
account_meta = [] |
243 |
usage = get_pithos_usage(request.x_auth_token) |
|
244 | 243 |
for x in accounts: |
245 | 244 |
if x == request.user_uniq: |
246 | 245 |
continue |
247 | 246 |
try: |
248 | 247 |
meta = request.backend.get_account_meta( |
249 |
request.user_uniq, x, 'pithos', include_user_defined=False, |
|
250 |
external_quota=usage) |
|
248 |
request.user_uniq, x, 'pithos', include_user_defined=False) |
|
251 | 249 |
groups = request.backend.get_account_groups(request.user_uniq, x) |
252 | 250 |
except NotAllowedError: |
253 | 251 |
raise faults.Forbidden('Not allowed') |
... | ... | |
284 | 282 |
# badRequest (400) |
285 | 283 |
|
286 | 284 |
until = get_int_parameter(request.GET.get('until')) |
287 |
usage = get_pithos_usage(request.x_auth_token) |
|
288 | 285 |
try: |
289 | 286 |
meta = request.backend.get_account_meta( |
290 |
request.user_uniq, v_account, 'pithos', until, |
|
291 |
external_quota=usage) |
|
287 |
request.user_uniq, v_account, 'pithos', until) |
|
292 | 288 |
groups = request.backend.get_account_groups( |
293 | 289 |
request.user_uniq, v_account) |
294 | 290 |
|
... | ... | |
297 | 293 |
groups[k] = retrieve_displaynames( |
298 | 294 |
getattr(request, 'token', None), groups[k]) |
299 | 295 |
policy = request.backend.get_account_policy( |
300 |
request.user_uniq, v_account, external_quota=usage)
|
|
296 |
request.user_uniq, v_account) |
|
301 | 297 |
except NotAllowedError: |
302 | 298 |
raise faults.Forbidden('Not allowed') |
303 | 299 |
|
... | ... | |
365 | 361 |
# badRequest (400) |
366 | 362 |
|
367 | 363 |
until = get_int_parameter(request.GET.get('until')) |
368 |
usage = get_pithos_usage(request.x_auth_token) |
|
369 | 364 |
try: |
370 | 365 |
meta = request.backend.get_account_meta( |
371 |
request.user_uniq, v_account, 'pithos', until, |
|
372 |
external_quota=usage) |
|
366 |
request.user_uniq, v_account, 'pithos', until) |
|
373 | 367 |
groups = request.backend.get_account_groups( |
374 | 368 |
request.user_uniq, v_account) |
375 | 369 |
policy = request.backend.get_account_policy( |
376 |
request.user_uniq, v_account, external_quota=usage)
|
|
370 |
request.user_uniq, v_account) |
|
377 | 371 |
except NotAllowedError: |
378 | 372 |
raise faults.Forbidden('Not allowed') |
379 | 373 |
|
Also available in: Unified diff