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=e04c5f52874e0a3232622a2107416bcabfdc8b92;hb=15628e77c42c880c4b32bc09261c69164124eaa6;hpb=bb74f6c1fab0460686fb0985d27e48566a7fc693

diff --git a/multivimbroker/multivimbroker/pub/msapi/extsys.py b/multivimbroker/multivimbroker/pub/msapi/extsys.py
index e04c5f5..d925a86 100644
--- a/multivimbroker/multivimbroker/pub/msapi/extsys.py
+++ b/multivimbroker/multivimbroker/pub/msapi/extsys.py
@@ -12,6 +12,7 @@
 
 import json
 import logging
+import re
 
 from multivimbroker.pub.exceptions import VimBrokerException
 from multivimbroker.pub.utils import restcall
@@ -19,6 +20,38 @@ from multivimbroker.pub.utils import restcall
 logger = logging.getLogger(__name__)
 
 
+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]
@@ -27,7 +60,13 @@ def split_vim_to_owner_region(vim_id):
 
 
 def get_vim_by_id(vim_id):
-    cloud_owner, cloud_region = split_vim_to_owner_region(vim_id)
+    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))