From: hewei-cmss <hewei@cmss.chinamobile.com>
Date: Fri, 20 Sep 2019 05:37:21 +0000 (+0800)
Subject: add exception
X-Git-Tag: 1.3.7~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Felalto;p=vfc%2Fnfvo%2Fcatalog.git

add exception

Issue-ID: VFC-1504

Signed-off-by: hewei-cmss <hewei@cmss.chinamobile.com>
Change-Id: I4cdf42a4de60021cf8283f6691cc2e2361048965
---

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)