summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/common/msapi/helper.py59
-rw-r--r--share/newton_base/proxy/services.py23
2 files changed, 81 insertions, 1 deletions
diff --git a/share/common/msapi/helper.py b/share/common/msapi/helper.py
new file mode 100644
index 00000000..0c27990b
--- /dev/null
+++ b/share/common/msapi/helper.py
@@ -0,0 +1,59 @@
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+import json
+import logging
+import re
+
+from common.exceptions import VimDriverNewtonException
+from common.utils import restcall
+
+
+logger = logging.getLogger(__name__)
+
+
+class Helper(object):
+
+ @staticmethod
+ def MultiCloudIdentityHelper(multicloud_api_prefix, cloud_owner, cloud_region_id, uri, data={}, header=''):
+ auth_api_url_format = "/{f_cloudowner}/{f_cloudregionid}/identity{f_uri}"
+ auth_api_url = auth_api_url_format.format(f_cloudowner=cloud_owner,
+ f_cloudregionid=cloud_region_id,
+ f_uri=uri)
+ extra_headers = header
+ ret = restcall._call_req(multicloud_api_prefix, "", "", 0, auth_api_url, "POST", extra_headers, json.dumps(data))
+ if ret[0] > 0 or ret[1] is None:
+ logger.critical("call url %s failed with status %s" % (multicloud_api_prefix+auth_api_url, ret[0]))
+ return None
+
+ resp = json.JSONDecoder().decode(ret[1])
+ return resp
+
+ # The consumer of this api must be attaching to the same management network of multicloud,
+ # The constraints comes from the returned catalog endpoint url e.g. "http://10.0.14.1:80/api/multicloud-titaniumcloud/v0/pod25_RegionOne/identity/v3"
+ @staticmethod
+ def MultiCloudServiceHelper(cloud_owner, cloud_region_id, v2_token_resp_json, service_type, uri, data=None, method="GET",):
+ # get endpoint from token response
+ token = v2_token_resp_json["access"]["token"]["id"]
+ catalogs = v2_token_resp_json["access"]["serviceCatalog"]
+ for catalog in catalogs:
+ if catalog['type'] == service_type:
+ # now we have endpoint
+ endpoint_url = catalog['endpoints'][0]['publicURL']
+ extra_headers = {'X-Auth-Token': token}
+ ret = restcall._call_req(endpoint_url, "", "", 0, uri, method, extra_headers, json.dumps(data) if data else "")
+ if ret[0] > 0 or ret[1] is None:
+ logger.critical("call url %s failed with status %s" % (endpoint_url+uri, ret[0]))
+ return None
+
+ content = json.JSONDecoder().decode(ret[1])
+ return content
+ pass
diff --git a/share/newton_base/proxy/services.py b/share/newton_base/proxy/services.py
index 6aa1bbce..36ae9840 100644
--- a/share/newton_base/proxy/services.py
+++ b/share/newton_base/proxy/services.py
@@ -269,7 +269,28 @@ class GetTenants(Services):
return Response(headers={'X-Subject-Token': tmp_auth_token}, data={'tenants': content['projects'],'tenants_links':[]},
status=resp.status_code)
else:
- return resp
+ viminfo = VimDriverUtils.get_vim_info(vimid)
+ session = VimDriverUtils.get_session(
+ viminfo, tenant_name=viminfo['tenant'])
+ tmp_auth_state = VimDriverUtils.get_auth_state(session)
+ tmp_auth_info = json.loads(tmp_auth_state)
+ tmp_auth_data = tmp_auth_info['body']
+ tenant = tmp_auth_data['token']['project']
+ content = {'projects': [
+ {
+ 'is_domain': False,
+ 'description': 'tenant info provisioned by VIM onborading',
+ 'enabled': True,
+ 'domain_id': viminfo['domain'],
+ 'parent_id': 'default',
+ 'id': tenant['id'],
+ 'name': tenant['name']
+ }
+ ]}
+ return Response(headers={'X-Subject-Token': tmp_auth_token}, data={'tenants': content['projects'],'tenants_links':[]},
+ status=status.HTTP_200_OK)
+
+ # return resp
def head(self, request, vimid="", servicetype="", requri=""):
self._logger.warn("wrong request with vimid, servicetype, requri> %s,%s,%s"