diff options
author | maopengzhang <zhang.maopeng1@zte.com.cn> | 2018-11-21 19:18:58 +0800 |
---|---|---|
committer | maopengzhang <zhang.maopeng1@zte.com.cn> | 2018-11-21 19:18:58 +0800 |
commit | d3afcddb0ce5132005227e4873aa3c28cf43b5cd (patch) | |
tree | f10026fad256e6512a809a7780df9b63e217ed8c | |
parent | af6a879fe24fdc83f3d72020d3a8ffb5c38f62cb (diff) |
fix NS&VNF package db parameter null
fix NS&VNF package db parameter null
Change-Id: I9bb91fe8ad9ecb16fe4096945b9a07b660719e3e
Issue-ID: VFC-1185
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
-rw-r--r-- | catalog/packages/biz/sdc_vnf_package.py | 8 | ||||
-rw-r--r-- | catalog/packages/biz/vnf_package.py | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/catalog/packages/biz/sdc_vnf_package.py b/catalog/packages/biz/sdc_vnf_package.py index 8db251be..73d5a8f0 100644 --- a/catalog/packages/biz/sdc_vnf_package.py +++ b/catalog/packages/biz/sdc_vnf_package.py @@ -27,6 +27,7 @@ from catalog.pub.msapi import sdc from catalog.pub.utils import fileutil from catalog.pub.utils import toscaparser from catalog.pub.utils.jobutil import JobUtil +from catalog.packages.const import PKG_STATUS logger = logging.getLogger(__name__) @@ -139,15 +140,20 @@ class NfDistributeThread(threading.Thread): vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_verison", "") 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( vnfPackageId=self.csar_id, vnfdId=vnfd_id, vnfVendor=vnf_provider, + vnfdProductName=vnfd_product_name, vnfdVersion=vnfd_ver, vnfSoftwareVersion=vnf_software_version, vnfdModel=vnfd_json, localFilePath=local_file_name, - vnfPackageUri=csar_name + vnfPackageUri=csar_name, + onboardingState=PKG_STATUS.ONBOARDED, + operationalState=PKG_STATUS.ENABLED, + usageState=PKG_STATUS.NOT_IN_USE ).save() JobUtil.add_job_status(self.job_id, 100, "CSAR(%s) distribute successfully." % self.csar_id) diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py index 1eea540a..a387378d 100644 --- a/catalog/packages/biz/vnf_package.py +++ b/catalog/packages/biz/vnf_package.py @@ -215,7 +215,8 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path): onboardingState=PKG_STATUS.ONBOARDED, operationalState=PKG_STATUS.ENABLED, usageState=PKG_STATUS.NOT_IN_USE, - localFilePath=vnf_pkg_path + localFilePath=vnf_pkg_path, + vnfPackageUri=os.path.split(vnf_pkg_path)[-1] ) else: raise CatalogException("VNF propeties and metadata in VNF Package(id=%s) are empty." % vnf_pkg_id) |