Revision f1ffc695 snf-cyclades-app/synnefo/management/common.py
| b/snf-cyclades-app/synnefo/management/common.py | ||
|---|---|---|
| 46 | 46 |
from synnefo.api.util import validate_network_size |
| 47 | 47 |
from synnefo.settings import (MAX_CIDR_BLOCK, |
| 48 | 48 |
CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN, |
| 49 |
CYCLADES_USER_CATALOG_URL)
|
|
| 49 |
ASTAKOS_URL)
|
|
| 50 | 50 |
from synnefo.logic.rapi import GanetiApiError, GanetiRapiClient |
| 51 | 51 |
from synnefo.lib import astakos |
| 52 | 52 |
|
| ... | ... | |
| 269 | 269 |
class UUIDCache(object): |
| 270 | 270 |
"""UUID-to-email cache""" |
| 271 | 271 |
|
| 272 |
user_catalogs_url = ASTAKOS_URL.replace("im/authenticate",
|
|
| 273 |
"service/api/user_catalogs") |
|
| 274 |
|
|
| 272 | 275 |
def __init__(self): |
| 273 | 276 |
self.users = {}
|
| 274 | 277 |
|
| ... | ... | |
| 277 | 280 |
|
| 278 | 281 |
if not uuid in self.users: |
| 279 | 282 |
try: |
| 280 |
self.users[uuid] =\ |
|
| 283 |
self.users[uuid] = \
|
|
| 281 | 284 |
astakos.get_displayname(token=ASTAKOS_TOKEN, |
| 282 |
url=CYCLADES_USER_CATALOG_URL,
|
|
| 285 |
url=UUIDCache.user_catalogs_url,
|
|
| 283 | 286 |
uuid=uuid) |
| 284 | 287 |
except Exception as e: |
| 285 | 288 |
log.error("Can not get display name for uuid %s: %s", uuid, e)
|
Also available in: Unified diff