X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fpub%2Fnfvi%2Fvim%2Fapi%2Fmultivim%2Fapi.py;h=11a772eef3ae12f9bebf6525084943255ff9d310;hb=f0c32021572945e00a30570d2323babb03401d16;hp=1f394aa4631ec05d43eda7e40e9e1aa1d04b1d0e;hpb=f2a5c03d4d695a5f10c1275aa1aa12c9279b5950;p=vfc%2Fnfvo%2Flcm.git diff --git a/lcm/pub/nfvi/vim/api/multivim/api.py b/lcm/pub/nfvi/vim/api/multivim/api.py index 1f394aa4..11a772ee 100644 --- a/lcm/pub/nfvi/vim/api/multivim/api.py +++ b/lcm/pub/nfvi/vim/api/multivim/api.py @@ -24,9 +24,9 @@ VIM_DRIVER_BASE_URL = "api/multicloud/v0" def call(vim_id, tenant_id, res, method, data=''): - if data and not isinstance(data, (str, unicode)): + if data and not isinstance(data, str): data = json.JSONEncoder().encode(data) - vim_id = json.JSONDecoder().decode(vim_id) if isinstance(vim_id, (str, unicode)) else vim_id + vim_id = json.JSONDecoder().decode(vim_id) if isinstance(vim_id, str) else vim_id 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,