diff options
Diffstat (limited to 'vio/vio/swagger/views/proxyplugin/identity/views.py')
| -rw-r--r-- | vio/vio/swagger/views/proxyplugin/identity/views.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/vio/vio/swagger/views/proxyplugin/identity/views.py b/vio/vio/swagger/views/proxyplugin/identity/views.py index ad3a8a7..c6db117 100644 --- a/vio/vio/swagger/views/proxyplugin/identity/views.py +++ b/vio/vio/swagger/views/proxyplugin/identity/views.py @@ -222,15 +222,17 @@ class TokenView(BaseClient): res[2] = MSB_ADDRESS + "/multicloud-vio/v0/" + \ vimid + "/" + i['name'] + "/" + tenantid j['url'] = "http:" + "//" + res[2] + + logger.info("vimid(%(vimid)s) service enpoints %(endpoint)s ", { + "vimid": vimid, "endpoint": vimEndpoints}) + tokenInfo['token']['value'] = resHeader['X-Subject-Token'] + catalog.storeEndpoint(vimid=vimid, endpoints=vimEndpoints) + except Exception as e: logging.exception("error %s" % e) return Response(data={'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - logger.info("vimid(%(vimid)s) service enpoints %(endpoint)s ", { - "vimid": vimid, "endpoint": vimEndpoints}) - tokenInfo['token']['value'] = resHeader['X-Subject-Token'] - catalog.storeEndpoint(vimid=vimid, endpoints=vimEndpoints) Res = Response(data=tokenInfo, status=status.HTTP_200_OK) Res['X-Subject-Token'] = resHeader['X-Subject-Token'] return Res @@ -366,14 +368,14 @@ def _keystoneV2Token(url, vimid=None, create_req=None): "/multicloud-vio/v0/" + vimid + \ "/" + cal["name"] + "/"+tenantid + logger.info("vimid(%(vimid)s) service enpoints %(endpoint)s ", { + "vimid": vimid, "endpoint": vimEndpoints}) + catalog.storeEndpoint(vimid=vimid, endpoints=vimEndpoints) + except Exception as e: logging.exception("error %s" % e) return Response(data={'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - logger.info("vimid(%(vimid)s) service enpoints %(endpoint)s ", { - "vimid": vimid, "endpoint": vimEndpoints}) - - catalog.storeEndpoint(vimid=vimid, endpoints=vimEndpoints) Res = Response(data=tokenInfo, status=status.HTTP_200_OK) return Res |