X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Fmsapi%2Fextsys.py;h=f5e26aa9a42c6b6c4b59541e9b43b59399ac270a;hb=refs%2Fchanges%2F31%2F28131%2F1;hp=1baa08a5b92a409bee36d8b16f2c2ff7f668c0c8;hpb=0aeb8d832d2e8142083edef1d2dee2f6fc4f1ddc;p=multicloud%2Fframework.git

diff --git a/multivimbroker/multivimbroker/pub/msapi/extsys.py b/multivimbroker/multivimbroker/pub/msapi/extsys.py
index 1baa08a..f5e26aa 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,24 +14,29 @@ import json
 import logging
 
 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.restcall import get_res_from_aai
 
 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 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")
+    cloud_owner, cloud_region = split_vim_to_owner_region(vim_id)
+    ret = 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(status_code=404,content=
-            "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