aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhewei-cmss <hewei@cmss.chinamobile.com>2019-09-20 13:37:21 +0800
committerhewei-cmss <hewei@cmss.chinamobile.com>2019-09-20 13:37:21 +0800
commit5d308c8d4b9f943338cca914097eb3f01bdf955b (patch)
treef783181da5c2d5a5be864a95bcbd76dca14fb66c
parent60520f27a797e099ec189a1ba2c746e94cdd62d7 (diff)
add exceptionelalto
Issue-ID: VFC-1504 Signed-off-by: hewei-cmss <hewei@cmss.chinamobile.com> Change-Id: I4cdf42a4de60021cf8283f6691cc2e2361048965
-rw-r--r--catalog/packages/biz/pnf_descriptor.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/catalog/packages/biz/pnf_descriptor.py b/catalog/packages/biz/pnf_descriptor.py
index 547c198d..e79cb3da 100644
--- a/catalog/packages/biz/pnf_descriptor.py
+++ b/catalog/packages/biz/pnf_descriptor.py
@@ -97,16 +97,17 @@ class PnfDescriptor(object):
'''
del_pnfd_id = pnf_pkgs[0].pnfdId
ns_pkgs = NSPackageModel.objects.all()
- for ns_pkg in ns_pkgs:
- nsd_model = None
- if ns_pkg.nsdModel:
- nsd_model = json.JSONDecoder().decode(ns_pkg.nsdModel)
- if not nsd_model:
- continue
- for pnf in nsd_model['pnfs']:
- if del_pnfd_id == pnf["properties"]["id"]:
- logger.warn("PNFD(%s) is referenced in NSD", del_pnfd_id)
- raise CatalogException('PNFD(%s) is referenced.' % pnfd_info_id)
+ if ns_pkgs:
+ for ns_pkg in ns_pkgs:
+ nsd_model = None
+ if ns_pkg.nsdModel:
+ nsd_model = json.JSONDecoder().decode(ns_pkg.nsdModel)
+ if not nsd_model:
+ continue
+ for pnf in nsd_model['pnfs']:
+ if del_pnfd_id == pnf["properties"]["id"]:
+ logger.warn("PNFD(%s) is referenced in NSD", del_pnfd_id)
+ raise CatalogException('PNFD(%s) is referenced.' % pnfd_info_id)
pnf_pkgs.delete()
pnf_pkg_path = os.path.join(CATALOG_ROOT_PATH, pnfd_info_id)
fileutil.delete_dirs(pnf_pkg_path)