diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2017-09-07 09:54:06 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2017-09-07 09:54:06 +0800 |
| commit | e89da401974dabc88c110cbb4b6da9f9dd14f9a3 (patch) | |
| tree | 477045fa546074c303e985d14cb17a2044e3bedd /newton/newton/proxy | |
| parent | 0a0adefe44123f161d79dd0341df6db3b7cdd404 (diff) | |
Populate cloud resources into AAI
populate tenants,flavors,images info into AAI
Change-Id: Ifa9701916168fd61814659622233b1129412b189
Issue-Id: MULTICLOUD-58
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'newton/newton/proxy')
| -rw-r--r-- | newton/newton/proxy/views/identityV3.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/newton/newton/proxy/views/identityV3.py b/newton/newton/proxy/views/identityV3.py index f11a6334..49a1c1b7 100644 --- a/newton/newton/proxy/views/identityV3.py +++ b/newton/newton/proxy/views/identityV3.py @@ -31,7 +31,7 @@ from newton.requests.views.util import VimDriverUtils logger = logging.getLogger(__name__) DEBUG=True -MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-newton/v0" %(config.MSB_SERVICE_IP, config.MSB_SERVICE_PORT) +#MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-newton/v0" %(config.MSB_SERVICE_IP, config.MSB_SERVICE_PORT) def update_catalog(vimid, catalog, multicould_namespace): ''' @@ -76,16 +76,13 @@ def update_catalog(vimid, catalog, multicould_namespace): endpoint_url = endpoint["url"] real_prefix = None real_suffix = None -# m = re.search(r'^(http[s]?://[0-9.]+:[0-9]+)(/([0-9a-zA-Z/._-]+)$)?', endpoint_url) - m = re.search(r'^(http[s]?://[0-9.]+[0-9:]*)(/([0-9a-zA-Z/._-]+)$)?', endpoint_url) + m = re.search(r'^(http[s]?://[0-9.]+:[0-9]+)(/([0-9a-zA-Z/._-]+)$)?', endpoint_url) + if not m: + m = re.search(r'^(http[s]?://[0-9.]+)(/([0-9a-zA-Z/._-]+)$)?', endpoint_url) if m: real_prefix = m.group(1) real_suffix = m.group(3) -# else: -# m = re.search(r'^(http[s]?://[0-9.]+)(/([0-9a-zA-Z/._-]+)$)?', endpoint_url) -# if m: -# real_prefix = m.group(1) -# real_suffix = m.group(2) + if real_prefix: # populate metadata_catalog one_catalog['prefix'] = real_prefix @@ -123,7 +120,7 @@ class Tokens(APIView): 'interface': 'public'} def __init__(self): - self.proxy_prefix = MULTICLOUD_PREFIX + self.proxy_prefix = config.MULTICLOUD_PREFIX self._logger = logger def post(self, request, vimid=""): @@ -169,7 +166,7 @@ class Catalog(APIView): 'interface': 'public'} def __init__(self): - self.proxy_prefix = MULTICLOUD_PREFIX + self.proxy_prefix = config.MULTICLOUD_PREFIX self._logger = logger def get(self, request, vimid=""): |