diff options
Diffstat (limited to 'newton/newton/proxy')
-rw-r--r-- | newton/newton/proxy/views/identityV3.py | 4 | ||||
-rw-r--r-- | newton/newton/proxy/views/services.py | 33 |
2 files changed, 30 insertions, 7 deletions
diff --git a/newton/newton/proxy/views/identityV3.py b/newton/newton/proxy/views/identityV3.py index 8f14f389..1afe14cf 100644 --- a/newton/newton/proxy/views/identityV3.py +++ b/newton/newton/proxy/views/identityV3.py @@ -49,9 +49,11 @@ class Tokens(APIView): resp = None resp_body = None try: + tenant_name = request.data.get("tenant_name") + # prepare request resource to vim instance vim = VimDriverUtils.get_vim_info(vimid) - sess = VimDriverUtils.get_session(vim) + sess = VimDriverUtils.get_session(vim, tenantname = tenant_name) tmp_auth_state = VimDriverUtils.get_auth_state(vim, sess) tmp_auth_info = json.loads(tmp_auth_state) diff --git a/newton/newton/proxy/views/services.py b/newton/newton/proxy/views/services.py index 1143464c..6e166f95 100644 --- a/newton/newton/proxy/views/services.py +++ b/newton/newton/proxy/views/services.py @@ -70,10 +70,13 @@ class Services(APIView): 'interface': interface, 'region_id': regionid} + self._logger.debug("service head request uri %s" % (req_resource)) + resp = sess.head(req_resource, endpoint_filter=service) #update token cache in case the token was required during the requests - tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) + #tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) content = resp.json() if resp.content else None + self._logger.debug("service head response: %s, %s" % (resp.status_code, content)) return Response(headers={'X-Subject-Token': tmp_auth_token}, data=content, status=resp.status_code) #return resp @@ -141,10 +144,14 @@ class Services(APIView): 'interface': interface, 'region_id': regionid} + self._logger.debug("service get request uri %s" % (req_resource)) + resp = sess.get(req_resource, endpoint_filter=service) #update token cache in case the token was required during the requests - tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) + #tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) content = resp.json() if resp.content else None + self._logger.debug("service get response: %s, %s" % (resp.status_code, content)) + content = ProxyUtils.update_prefix(metadata_catalog, content) return Response(headers={'X-Subject-Token': tmp_auth_token}, data=content, status=resp.status_code) #return resp @@ -213,10 +220,14 @@ class Services(APIView): 'interface': interface, 'region_id': regionid} + self._logger.debug("service post request uri %s" % (req_resource)) + resp = sess.post(req_resource, data=json.JSONEncoder().encode(request.data),endpoint_filter=service) # update token cache in case the token was required during the requests - tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) + #tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) content = resp.json() if resp.content else None + self._logger.debug("service post response: %s, %s" % (resp.status_code, content)) + content = ProxyUtils.update_prefix(metadata_catalog, content) return Response(headers={'X-Subject-Token': tmp_auth_token}, data=content, status=resp.status_code) @@ -285,10 +296,14 @@ class Services(APIView): 'interface': interface, 'region_id': regionid} + self._logger.debug("service put request uri %s" % (req_resource)) + resp = sess.put(req_resource, data=json.JSONEncoder().encode(request.data),endpoint_filter=service) # update token cache in case the token was required during the requests - tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) + #tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) content = resp.json() if resp.content else None + self._logger.debug("service put response: %s, %s" % (resp.status_code, content)) + content = ProxyUtils.update_prefix(metadata_catalog, content) return Response(headers={'X-Subject-Token': tmp_auth_token}, data=content, status=resp.status_code) @@ -358,10 +373,14 @@ class Services(APIView): 'interface': interface, 'region_id': regionid} + self._logger.debug("service patch request uri %s" % (req_resource)) + resp = sess.patch(req_resource, data=json.JSONEncoder().encode(request.data),endpoint_filter=service) # update token cache in case the token was required during the requests - tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) + #tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) content = resp.json() if resp.content else None + self._logger.debug("service patch response: %s, %s" % (resp.status_code, content)) + content = ProxyUtils.update_prefix(metadata_catalog, content) return Response(headers={'X-Subject-Token': tmp_auth_token}, data=content, status=resp.status_code) @@ -430,9 +449,11 @@ class Services(APIView): 'interface': interface, 'region_id': regionid} + self._logger.debug("service delete request uri %s" % (req_resource)) + resp = sess.delete(req_resource, endpoint_filter=service) # update token cache in case the token was required during the requests - tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) + #tmp_auth_token = VimDriverUtils.update_token_cache(vim, sess, tmp_auth_token, tmp_auth_state) return Response(headers={'X-Subject-Token': tmp_auth_token}, status=resp.status_code) |