diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2017-11-30 09:25:53 +0800 |
|---|---|---|
| committer | yunlong ying <ying.yunlong@zte.com.cn> | 2017-12-04 01:59:40 +0000 |
| commit | 27f9b6906ab0f551d5680058d0d9bfea5273884a (patch) | |
| tree | 60bb891b48956704971246a57ae6364a47b455e0 | |
| parent | bca34c9785fbb496fad02284ea2bb7f8f326aa84 (diff) | |
Fix vfc-catalog ns onboard bug
Change-Id: I30ada7a85bec50467441d05ecff390fa11c76621
Issue-ID: VFC-596
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
(cherry picked from commit eae1813c26b8249b3209fcdfe54e24b782dffa6f)
| -rw-r--r-- | catalog/packages/ns_package.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py index 4b7ec927..21e88e90 100644 --- a/catalog/packages/ns_package.py +++ b/catalog/packages/ns_package.py @@ -46,6 +46,8 @@ def ns_on_distribute(csar_id): logger.error(traceback.format_exc()) NsPackage().delete_catalog(csar_id) return fmt_ns_pkg_rsp(STATUS_FAILED, str(sys.exc_info())) + if ret[0]: + return fmt_ns_pkg_rsp(STATUS_FAILED, ret[1]) return fmt_ns_pkg_rsp(STATUS_SUCCESS, ret[1], "") @@ -111,7 +113,7 @@ class NsPackage(object): def on_distribute(self, csar_id): if NSPackageModel.objects.filter(nsPackageId=csar_id): - raise CatalogException("NS CSAR(%s) already exists." % csar_id) + return [1, "NS CSAR(%s) already exists." % csar_id] artifact = sdc.get_artifact(sdc.ASSETTYPE_SERVICES, csar_id) local_path = os.path.join(CATALOG_ROOT_PATH, csar_id) |