Revision e407f159 snf-cyclades-app/synnefo/helpdesk/views.py
| b/snf-cyclades-app/synnefo/helpdesk/views.py | ||
|---|---|---|
| 114 | 114 |
raise Http404 |
| 115 | 115 |
|
| 116 | 116 |
token = get_token_from_cookie(request, AUTH_COOKIE_NAME) |
| 117 |
astakos.get_user(request, settings.ASTAKOS_BASE_URL,
|
|
| 117 |
astakos.get_user(request, settings.ASTAKOS_AUTH_URL,
|
|
| 118 | 118 |
fallback_token=token, logger=logger) |
| 119 | 119 |
if hasattr(request, 'user') and request.user: |
| 120 | 120 |
groups = request.user.get('groups', [])
|
| ... | ... | |
| 204 | 204 |
account = None |
| 205 | 205 |
search_query = vmid |
| 206 | 206 |
|
| 207 |
astakos_client = astakosclient.AstakosClient(settings.ASTAKOS_BASE_URL,
|
|
| 208 |
retry=2, use_pool=True,
|
|
| 209 |
logger=logger)
|
|
| 207 |
astakos_client = astakosclient.AstakosClient( |
|
| 208 |
auth_token, settings.ASTAKOS_AUTH_URL,
|
|
| 209 |
retry=2, use_pool=True, logger=logger)
|
|
| 210 | 210 |
|
| 211 | 211 |
account = None |
| 212 | 212 |
if is_uuid: |
| 213 | 213 |
account = search_query |
| 214 | 214 |
try: |
| 215 |
account_name = astakos_client.get_username(auth_token, account)
|
|
| 215 |
account_name = astakos_client.get_username(account) |
|
| 216 | 216 |
except: |
| 217 | 217 |
logger.info("Failed to resolve '%s' into account" % account)
|
| 218 | 218 |
|
| 219 | 219 |
if account_exists and not is_uuid: |
| 220 | 220 |
account_name = search_query |
| 221 | 221 |
try: |
| 222 |
account = astakos_client.get_uuid(auth_token, account_name)
|
|
| 222 |
account = astakos_client.get_uuid(account_name) |
|
| 223 | 223 |
except: |
| 224 | 224 |
logger.info("Failed to resolve '%s' into account" % account_name)
|
| 225 | 225 |
|
Also available in: Unified diff