From 1b95ed65a13ef5c5abc391755b407e05d2e6682a Mon Sep 17 00:00:00 2001 From: fujinhua Date: Thu, 30 Nov 2017 09:20:11 +0800 Subject: [PATCH] Remove rollback when nf csar exists Change-Id: I002ffc38634c63cbffb7ad8781fb20813c606b65 Issue-ID: VFC-600 Signed-off-by: fujinhua --- catalog/packages/nf_package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py index 5b4a9a76..f97c6ceb 100644 --- a/catalog/packages/nf_package.py +++ b/catalog/packages/nf_package.py @@ -108,7 +108,9 @@ class NfDistributeThread(threading.Thread): JobUtil.add_job_status(self.job_id, 5, "Start CSAR(%s) distribute." % self.csar_id) if VnfPackageModel.objects.filter(vnfPackageId=self.csar_id): - raise CatalogException("NF CSAR(%s) already exists." % self.csar_id) + err_msg = "NF CSAR(%s) already exists." % self.csar_id + JobUtil.add_job_status(self.job_id, JOB_ERROR, err_msg) + return artifact = sdc.get_artifact(sdc.ASSETTYPE_RESOURCES, self.csar_id) local_path = os.path.join(CATALOG_ROOT_PATH, self.csar_id) -- 2.16.6