X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Fmsapi%2Fextsys.py;h=d925a86fac466d08a1e368355fe5189dc25469cb;hp=75959a4bcff9a6f24f604859ae5f86c015fe81bc;hb=15628e77c42c880c4b32bc09261c69164124eaa6;hpb=67430600410e312c2db5a6a7709da8e45a5245fa

diff --git a/multivimbroker/multivimbroker/pub/msapi/extsys.py b/multivimbroker/multivimbroker/pub/msapi/extsys.py
index 75959a4..d925a86 100644
--- a/multivimbroker/multivimbroker/pub/msapi/extsys.py
+++ b/multivimbroker/multivimbroker/pub/msapi/extsys.py
@@ -1,4 +1,5 @@
 # Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,28 +12,71 @@
 
 import json
 import logging
+import re
 
 from multivimbroker.pub.exceptions import VimBrokerException
-from multivimbroker.pub.utils.restcall import req_by_msb
-from multivimbroker.pub.config.config import ESR_GET_VIM_URI
+from multivimbroker.pub.utils import restcall
 
 logger = logging.getLogger(__name__)
 
 
-def get_vims():
-    ret = req_by_msb(ESR_GET_VIM_URI, "GET")
-    if ret[0] != 0:
-        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
-        raise VimBrokerException(
-            status_code=404, content="Failed to query VIMs from extsys.")
-    return json.JSONDecoder().decode(ret[1])
+def encode_vim_id(cloud_owner, cloud_region_id):
+    '''
+    compose vim_id by cloud_owner and cloud_region, make sure the vimid can be
+    converted back when talking to AAI,etc.
+    This is a backward compatibility design to reuse the existing
+    implementation code
+    :param cloud_owner:
+    :param cloud_region:
+    :return:
+    '''
+
+    # since the {cloud_owner}/{cloud_region_id"} is globally unique, the
+    # concatenated one as below will be unique as well.
+
+    vim_id = cloud_owner + "_" + cloud_region_id
+
+    # other options:
+    # 1, store it into cache so the decode and just look up the cache for
+    # decoding
+    # 2, use other delimiter in case that '_' was used by
+    # cloud owner/cloud region id,
+    # e.g. '.', '#', hence the decode need to try more than one time
+
+    return vim_id
+
+
+def decode_vim_id(vim_id):
+    m = re.search(r'^([0-9a-zA-Z-]+)_([0-9a-zA-Z_-]+)$', vim_id)
+    cloud_owner, cloud_region_id = m.group(1), m.group(2)
+    return cloud_owner, cloud_region_id
+
+
+def split_vim_to_owner_region(vim_id):
+    split_vim = vim_id.split('_')
+    cloud_owner = split_vim[0]
+    cloud_region = "".join(split_vim[1:])
+    return cloud_owner, cloud_region
 
 
 def get_vim_by_id(vim_id):
-    ret = req_by_msb("%s/%s" % (ESR_GET_VIM_URI, vim_id), "GET")
+    if vim_id == "vmware_fake":
+        return {
+            "type": "vmware",
+            "version": "4.0",
+            "vimId": vim_id
+        }
+    cloud_owner, cloud_region = decode_vim_id(vim_id)
+    ret = restcall.get_res_from_aai("/cloud-infrastructure/cloud-regions/"
+                                    "cloud-region/%s/%s" % (
+                                        cloud_owner, cloud_region))
     if ret[0] != 0:
-        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        logger.error("Status code is %s, detail is %s." % (ret[2], ret[1]))
         raise VimBrokerException(
             status_code=404,
             content="Failed to query VIM with id (%s) from extsys." % vim_id)
-    return json.JSONDecoder().decode(ret[1])
+    ret = json.JSONDecoder().decode(ret[1])
+    ret['type'] = ret['cloud-type']
+    ret['version'] = ret['cloud-region-version']
+    ret['vimId'] = vim_id
+    return ret