diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2018-11-13 15:40:01 +0800 |
|---|---|---|
| committer | fujinhua <fu.jinhua@zte.com.cn> | 2018-11-13 15:40:01 +0800 |
| commit | 2585198f61e73f7d59d9f6b27dad7f23730f6479 (patch) | |
| tree | 0c1296e47bc9b3ad9e3cdd56d689c6ce96dd97b6 | |
| parent | 6db745bd9eb4b9aa6c47a9b7ffcc07e4644f2b7d (diff) | |
Fix vnf pkg upload logic
Change-Id: I30d9005f383df75d835c12fc0b0445410e504c26
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
| -rw-r--r-- | catalog/packages/biz/vnf_package.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py index 368d6f60..2ecc35b8 100644 --- a/catalog/packages/biz/vnf_package.py +++ b/catalog/packages/biz/vnf_package.py @@ -103,9 +103,9 @@ class VnfPackage(object): def upload(self, vnf_pkg_id, remote_file): logger.info('Start to upload VNF package(%s)...' % vnf_pkg_id) vnf_pkg = VnfPackageModel.objects.filter(vnfPackageId=vnf_pkg_id) - if vnf_pkg[0].onboardingState != PKG_STATUS.CREATED: - logger.error("VNF package(%s) is not CREATED" % vnf_pkg_id) - raise CatalogException("VNF package(%s) is not CREATED" % vnf_pkg_id) + # if vnf_pkg[0].onboardingState != PKG_STATUS.CREATED: + # logger.error("VNF package(%s) is not CREATED" % vnf_pkg_id) + # raise CatalogException("VNF package(%s) is not CREATED" % vnf_pkg_id) vnf_pkg.update(onboardingState=PKG_STATUS.UPLOADING) local_file_name = save(remote_file, vnf_pkg_id) @@ -196,8 +196,9 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path): if vnfd.get("vnf", "") != "": vnfd_id = vnfd["vnf"]["properties"].get("descriptor_id", "") - if VnfPackageModel.objects.filter(vnfdId=vnfd_id): - logger.error("VNF package(%s) already exists." % vnfd_id) + other_pkg = VnfPackageModel.objects.filter(vnfdId=vnfd_id) + if other_pkg and other_pkg[0].vnfPackageId != vnf_pkg_id: + logger.error("VNF package(%s,%s) already exists.", other_pkg[0].vnfPackageId, vnfd_id) raise CatalogException("VNF package(%s) already exists." % vnfd_id) vnf_provider = vnfd["vnf"].get("provider", "") vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_verison", "") @@ -218,7 +219,7 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path): ) else: raise CatalogException("VNF propeties and metadata in VNF Package(id=%s) are empty." % vnf_pkg_id) - logger.info('VNF package(%s) has been processed.' % vnf_pkg_id) + logger.info('VNF package(%s) has been processed(done).' % vnf_pkg_id) def handle_upload_failed(vnf_pkg_id): |