From aef67d1a1fb076f154f9f7595b54590fc7499ee6 Mon Sep 17 00:00:00 2001 From: "Olivia.Zhan" Date: Fri, 12 Jul 2019 15:00:04 +0800 Subject: Update python2 to python3 Issue-ID: VFC-1429 Signed-off-by: Olivia.Zhan Change-Id: I9ec0ccfa5ba200c690a85d582cee41009dfdc0f0 --- genericparser/packages/biz/sdc_ns_package.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'genericparser/packages/biz/sdc_ns_package.py') diff --git a/genericparser/packages/biz/sdc_ns_package.py b/genericparser/packages/biz/sdc_ns_package.py index 42346ff..63a077f 100644 --- a/genericparser/packages/biz/sdc_ns_package.py +++ b/genericparser/packages/biz/sdc_ns_package.py @@ -43,7 +43,7 @@ def ns_on_distribute(csar_id): ret = NsPackage().on_distribute(csar_id) except GenericparserException as e: NsPackage().delete_csar(csar_id) - return fmt_ns_pkg_rsp(STATUS_FAILED, e.message) + return fmt_ns_pkg_rsp(STATUS_FAILED, e.args[0]) except: logger.error(traceback.format_exc()) NsPackage().delete_csar(csar_id) @@ -58,7 +58,7 @@ def ns_delete_csar(csar_id): try: ret = NsPackage().delete_csar(csar_id) except GenericparserException as e: - return fmt_ns_pkg_rsp(STATUS_FAILED, e.message) + return fmt_ns_pkg_rsp(STATUS_FAILED, e.args[0]) except: logger.error(traceback.format_exc()) return fmt_ns_pkg_rsp(STATUS_FAILED, str(sys.exc_info())) @@ -70,7 +70,7 @@ def ns_get_csars(): try: ret = NsPackage().get_csars() except GenericparserException as e: - return [1, e.message] + return [1, e.args[0]] except: logger.error(traceback.format_exc()) return [1, str(sys.exc_info())] @@ -82,9 +82,9 @@ def ns_get_csar(csar_id): try: ret = NsPackage().get_csar(csar_id) except GenericparserException as e: - return [1, e.message] + return [1, e.args[0]] except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) return [1, str(sys.exc_info())] return ret @@ -99,9 +99,9 @@ def parse_nsd(csar_id, inputs): csar_path = ns_pkg[0].localFilePath ret = {"model": toscaparsers.parse_nsd(csar_path, inputs)} except GenericparserException as e: - return [1, e.message] + return [1, e.args[0]] except Exception as e: - logger.error(e.message) + logger.error(e.args[0]) logger.error(traceback.format_exc()) return [1, str(sys.exc_info())] return [0, ret] -- cgit 1.2.3-korg