diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2017-11-30 01:32:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-30 01:32:17 +0000 |
| commit | 179bd0eace151a41a34c7b7ba7850ae3c51da3c5 (patch) | |
| tree | 9b7ea2b877ea28512e0343d324fb7909bc58a3c7 | |
| parent | 1b95ed65a13ef5c5abc391755b407e05d2e6682a (diff) | |
| parent | eae1813c26b8249b3209fcdfe54e24b782dffa6f (diff) | |
Merge "Fix vfc-catalog ns onboard bug"
| -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) |