diff options
author | Fu Jinhua <fu.jinhua@zte.com.cn> | 2019-10-28 03:32:17 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-10-28 03:32:17 +0000 |
commit | 109f586033c0d63fc1baa19f80bbfbe20ca68f2d (patch) | |
tree | 106af1258916aa54ca333b9d990537d20c2ff6ca | |
parent | d62a90a858728fa84acf2eade65f9909f67b7513 (diff) | |
parent | 5c876a2964112e42ee49452e31bd2f065b17a080 (diff) |
Merge "optimize catalog api"
-rw-r--r-- | catalog/packages/biz/sdc_vnf_package.py | 3 | ||||
-rw-r--r-- | catalog/packages/biz/service_descriptor.py | 6 | ||||
-rw-r--r-- | catalog/packages/biz/vnf_package.py | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/catalog/packages/biz/sdc_vnf_package.py b/catalog/packages/biz/sdc_vnf_package.py index 571c3bb0..81e4454c 100644 --- a/catalog/packages/biz/sdc_vnf_package.py +++ b/catalog/packages/biz/sdc_vnf_package.py @@ -217,6 +217,9 @@ class NfPackage(object): def get_csars(self): csars = [] nf_pkgs = VnfPackageModel.objects.filter() + if not nf_pkgs.exists(): + logger.debug("NF package infos does not exist.") + return [] for nf_pkg in nf_pkgs: ret = self.get_csar(nf_pkg.vnfPackageId) csars.append(ret[1]) diff --git a/catalog/packages/biz/service_descriptor.py b/catalog/packages/biz/service_descriptor.py index 11b6fb37..3814acea 100644 --- a/catalog/packages/biz/service_descriptor.py +++ b/catalog/packages/biz/service_descriptor.py @@ -20,7 +20,7 @@ import uuid from catalog.packages.const import PKG_STATUS from catalog.pub.config.config import CATALOG_ROOT_PATH from catalog.pub.database.models import ServicePackageModel, VnfPackageModel, PnfPackageModel -from catalog.pub.exceptions import CatalogException, PackageNotFoundException +from catalog.pub.exceptions import CatalogException from catalog.pub.utils import toscaparser, fileutil from catalog.pub.utils.values import ignore_case_get @@ -121,8 +121,8 @@ class ServiceDescriptor(object): logger.info('Start to delete ServiceD(%s)...' % serviced_info_id) service_pkgs = ServicePackageModel.objects.filter(servicePackageId=serviced_info_id) if not service_pkgs.exists(): - logger.warn('ServiceD(%s) not found.' % serviced_info_id) - raise PackageNotFoundException("Service package[%s] not Found." % serviced_info_id) + logger.info('ServiceD(%s) not found.' % serviced_info_id) + return service_pkgs.delete() service_pkg_path = os.path.join(CATALOG_ROOT_PATH, serviced_info_id) fileutil.delete_dirs(service_pkg_path) diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py index 585a599b..7cba4484 100644 --- a/catalog/packages/biz/vnf_package.py +++ b/catalog/packages/biz/vnf_package.py @@ -61,6 +61,9 @@ class VnfPackage(object): def query_multiple(self): pkgs_info = [] nf_pkgs = VnfPackageModel.objects.filter() + if not nf_pkgs.exists(): + logger.debug("VNF infos does not exist.") + return [] for nf_pkg in nf_pkgs: ret = fill_response_data(nf_pkg) pkgs_info.append(ret) |