X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Fmsapi%2Fextsys.py;h=e04c5f52874e0a3232622a2107416bcabfdc8b92;hb=a2be701e860a06df93083888e7d5f8c64cea4183;hp=4683ae5091acab462b39be66d1253a2f72f928b8;hpb=b1b0386b5ed988fbbf25e326c3d0ce951eff07cd;p=multicloud%2Fframework.git

diff --git a/multivimbroker/multivimbroker/pub/msapi/extsys.py b/multivimbroker/multivimbroker/pub/msapi/extsys.py
index 4683ae5..e04c5f5 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.
@@ -13,22 +14,30 @@ import json
 import logging
 
 from multivimbroker.pub.exceptions import VimBrokerException
-from multivimbroker.pub.utils.restcall import req_by_msb
+from multivimbroker.pub.utils import restcall
 
 logger = logging.getLogger(__name__)
 
 
-def get_vims():
-    ret = req_by_msb("/openoapi/extsys/v1/vims", "GET")
-    if ret[0] != 0:
-        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
-        raise VimBrokerException("Failed to query VIMs from extsys.")
-    return json.JSONDecoder().decode(ret[1])
+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("/openoapi/extsys/v1/vims/%s" % vim_id, "GET")
+    cloud_owner, cloud_region = split_vim_to_owner_region(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])
-        raise VimBrokerException("Failed to query VIM with id (%s) from extsys." % vim_id)
-    return json.JSONDecoder().decode(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)
+    ret = json.JSONDecoder().decode(ret[1])
+    ret['type'] = ret['cloud-type']
+    ret['version'] = ret['cloud-region-version']
+    ret['vimId'] = vim_id
+    return ret