Revision 4ab620b6 snf-pithos-app/pithos/api/functions.py
b/snf-pithos-app/pithos/api/functions.py | ||
---|---|---|
40 | 40 |
from django.utils.encoding import smart_str |
41 | 41 |
from django.views.decorators.csrf import csrf_exempt |
42 | 42 |
|
43 |
from snf_django.lib.astakos import get_user, get_uuids as _get_uuids |
|
43 |
from django.conf import settings |
|
44 |
from snf_django.lib.astakos import get_uuids as _get_uuids |
|
44 | 45 |
|
45 | 46 |
from snf_django.lib import api |
46 | 47 |
from snf_django.lib.api import faults |
... | ... | |
61 | 62 |
) |
62 | 63 |
|
63 | 64 |
from pithos.api.settings import (UPDATE_MD5, TRANSLATE_UUIDS, |
64 |
SERVICE_TOKEN, AUTHENTICATION_URL)
|
|
65 |
SERVICE_TOKEN) |
|
65 | 66 |
|
66 | 67 |
from pithos.backends.base import ( |
67 | 68 |
NotAllowedError, QuotaError, ContainerNotEmpty, ItemNotExists, |
... | ... | |
77 | 78 |
|
78 | 79 |
def get_uuids(names): |
79 | 80 |
try: |
80 |
uuids = _get_uuids(SERVICE_TOKEN, names, |
|
81 |
url=AUTHENTICATION_URL.replace( |
|
82 |
'im/authenticate', |
|
83 |
'service/api/user_catalogs')) |
|
81 |
url = settings.ASTAKOS_URL + "/service/api/user_catalogs" |
|
82 |
uuids = _get_uuids(SERVICE_TOKEN, names, url=url) |
|
84 | 83 |
except Exception, e: |
85 | 84 |
logger.exception(e) |
86 | 85 |
return {} |
Also available in: Unified diff