diff options
| -rw-r--r-- | lcm/pub/nfvi/vim/api/multivim/api.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lcm/pub/nfvi/vim/api/multivim/api.py b/lcm/pub/nfvi/vim/api/multivim/api.py index 7556e9e3..1f394aa4 100644 --- a/lcm/pub/nfvi/vim/api/multivim/api.py +++ b/lcm/pub/nfvi/vim/api/multivim/api.py @@ -27,19 +27,18 @@ def call(vim_id, tenant_id, res, method, data=''): if data and not isinstance(data, (str, unicode)): data = json.JSONEncoder().encode(data) vim_id = json.JSONDecoder().decode(vim_id) if isinstance(vim_id, (str, unicode)) else vim_id - cloud_owner = vim_id['cloud_owner'] - cloud_regionid = vim_id['cloud_regionid'] - # url = "{base_url}/{vim_id}{tenant_id}/{res}".format( - # base_url=VIM_DRIVER_BASE_URL, - # vim_id=vim_id, - # tenant_id="/" + tenant_id if tenant_id else "", - # res=res) - url = "{base_url}/{cloud_owner}/{cloud_regionid}/{tenant_id}/{res}".format( + vim_id = "%s_%s" % (vim_id['cloud_owner'], vim_id['cloud_regionid']) + url = "{base_url}/{vim_id}{tenant_id}/{res}".format( base_url=VIM_DRIVER_BASE_URL, - cloud_owner=cloud_owner, - cloud_regionid=cloud_regionid, - tenant_id=tenant_id if tenant_id else "", + vim_id=vim_id, + tenant_id="/" + tenant_id if tenant_id else "", res=res) + # url = "{base_url}/{cloud_owner}/{cloud_regionid}{tenant_id}/{res}".format( + # base_url=VIM_DRIVER_BASE_URL, + # cloud_owner=cloud_owner, + # cloud_regionid=cloud_regionid, + # tenant_id="/" + tenant_id if tenant_id else "", + # res=res) ret = req_by_msb(url, method, data) if ret[0] > 0: raise VimException(ret[1], ret[2]) |