diff options
author | hongyuzhao <zhao.hongyu@zte.com.cn> | 2019-06-28 09:51:33 +0800 |
---|---|---|
committer | hongyuzhao <zhao.hongyu@zte.com.cn> | 2019-07-03 11:19:09 +0800 |
commit | 46ad7c172411214c5432ed93fda4271288077447 (patch) | |
tree | 74adb32f9cdfe575184e67068faac9bc6c2117b7 /lcm/lcm/pub/vimapi | |
parent | 37b1ae2386c365293249421595f0722c25bc8e8d (diff) |
vfclcm upgrade from python2 to python3
Change-Id: Ia55ae38ec64fc3d821d1e7e1c0cbe48b572a0dd4
Issue-ID: VFC-1429
Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>
Diffstat (limited to 'lcm/lcm/pub/vimapi')
-rw-r--r-- | lcm/lcm/pub/vimapi/adaptor.py | 6 | ||||
-rw-r--r-- | lcm/lcm/pub/vimapi/api.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index ae18863a..45cae34e 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -107,7 +107,7 @@ def operate_vim_res(data, changeStateTo, stopType, gracefulStopTimeout, do_notif do_notify_op("INACTIVE", res["id"]) except VimException as e: logger.error("Failed to Operate %s(%s)", RES_VM, res["res_id"]) - logger.error("%s:%s", e.http_code, e.message) + logger.error("%s:%s", e.http_code, e.args[0]) raise NFLCMException("Failed to Operate %s(%s)", RES_VM, res["res_id"]) @@ -128,7 +128,7 @@ def heal_vim_res(vdus, vnfd_info, do_notify, data, vim_cache, res_cache): action_vm(ACTION_TYPE.REBOOT, vm_info, vimid, tenant) except VimException as e: logger.error("Failed to Heal %s(%s)", RES_VM, resid) - logger.error("%s:%s", e.http_code, e.message) + logger.error("%s:%s", e.http_code, e.args[0]) raise NFLCMException("Failed to Heal %s(%s)" % (RES_VM, resid)) @@ -385,7 +385,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): "volumeId": get_res_id(res_cache, RES_VOLUME, vol_id) }) - user_data = base64.encodestring(ignore_case_get(vm["properties"], "user_data")) + user_data = base64.b64encode(bytes(ignore_case_get(vm["properties"], "user_data"), "utf-8")).decode("utf-8") set_opt_val(param, "availabilityZone", ignore_case_get(location_info, "availability_zone")) set_opt_val(param, "userdata", user_data) set_opt_val(param, "metadata", ignore_case_get(vm["properties"], "meta_data")) diff --git a/lcm/lcm/pub/vimapi/api.py b/lcm/lcm/pub/vimapi/api.py index 74fae1c6..857c3a94 100644 --- a/lcm/lcm/pub/vimapi/api.py +++ b/lcm/lcm/pub/vimapi/api.py @@ -27,7 +27,7 @@ MUTEX_PORT = Lock() 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) url_fmt = "{base_url}/{vim_id}{tenant_id}/{res}" url = url_fmt.format(base_url=VIM_DRIVER_BASE_URL, |