try:
ret = NfPackage().get_csars()
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
try:
ret = NfPackage().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
csar_path = nf_pkg[0].localFilePath
ret = {"model": toscaparsers.parse_vnfd(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]
self.on_distribute()
except GenericparserException as e:
self.rollback_distribute()
- JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
+ JobUtil.add_job_status(self.job_id, JOB_ERROR, e.args[0])
except Exception as e:
- logger.error(e.message)
+ logger.error(e.args[0])
logger.error(traceback.format_exc())
logger.error(str(sys.exc_info()))
self.rollback_distribute()
vnfd = json.JSONDecoder().decode(vnfd_json)
if not vnfd.get("vnf"):
- raise GenericparserException("VNF propeties and metadata in VNF Package(id=%s) are empty." % self.csar_id)
+ raise GenericparserException("VNF properties and metadata in VNF Package(id=%s) are empty." % self.csar_id)
vnfd_id = vnfd["vnf"]["properties"].get("descriptor_id", "")
if VnfPackageModel.objects.filter(vnfdId=vnfd_id):
logger.error("VNF package(%s) already exists.", vnfd_id)
raise GenericparserException("VNF package(%s) already exists." % vnfd_id)
JobUtil.add_job_status(self.job_id, 30, "Save CSAR(%s) to database." % self.csar_id)
- vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_verison", "")
+ vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_version", "")
vnf_provider = vnfd["vnf"]["properties"].get("provider", "")
vnf_software_version = vnfd["vnf"]["properties"].get("software_version", "")
vnfd_product_name = vnfd["vnf"]["properties"].get("product_name", "")
VnfPackageModel.objects.filter(vnfPackageId=self.csar_id).delete()
fileutil.delete_dirs(self.csar_save_path)
except Exception as e:
- logger.error(e.message)
+ logger.error(e.args[0])
logger.error(traceback.format_exc())
logger.error(str(sys.exc_info()))
try:
self.delete_csar()
except GenericparserException as e:
- JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
+ JobUtil.add_job_status(self.job_id, JOB_ERROR, e.args[0])
except Exception as e:
- logger.error(e.message)
+ logger.error(e.args[0])
logger.error(traceback.format_exc())
logger.error(str(sys.exc_info()))
JobUtil.add_job_status(self.job_id, JOB_ERROR, "Failed to delete CSAR(%s)" % self.csar_id)