From 5c876a2964112e42ee49452e31bd2f065b17a080 Mon Sep 17 00:00:00 2001 From: hewei-cmss Date: Mon, 21 Oct 2019 11:06:41 +0800 Subject: optimize catalog api Issue-ID: VFC-1504 Signed-off-by: hewei-cmss Change-Id: I9cb4f64f365700e1899742bfa17fc42c8919e172 --- catalog/packages/biz/sdc_vnf_package.py | 3 +++ catalog/packages/biz/service_descriptor.py | 6 +++--- 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) -- cgit 1.2.3-korg