fix SDC service onboarded error

fix SDC service onboarded error

Change-Id: I76ecd5082307409246594889fd543b3f9d86f964
Issue-ID: VFC-1041
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
(cherry picked from commit 668b43dae636317fb0d9323e9fc0f0ebcc5b597f)

diff --git a/catalog/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py
index 0e4dff0..f0e0572 100644 (file)
--- a/catalog/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@ -147,6 +147,8 @@ class NsDescriptor(object):
             if vnfd_id == "undefined":
                 vnfd_id = vnf["properties"].get("id", "undefined")
             pkg = VnfPackageModel.objects.filter(vnfdId=vnfd_id)
+            if not pkg:
+                pkg = VnfPackageModel.objects.filter(vnfPackageId=vnfd_id)
             if not pkg:
                 vnfd_name = vnf.get("vnf_id", "undefined")
                 logger.error("[%s] is not distributed.", vnfd_name)
@@ -157,6 +159,8 @@ class NsDescriptor(object):
             if pnfd_id == "undefined":
                 pnfd_id = pnf["properties"].get("id", "undefined")
             pkg = PnfPackageModel.objects.filter(pnfdId=pnfd_id)
+            if not pkg:
+                pkg = PnfPackageModel.objects.filter(pnfPackageId=pnfd_id)
             if not pkg:
                 pnfd_name = pnf.get("pnf_id", "undefined")
                 logger.error("[%s] is not distributed.", pnfd_name)
@@ -206,6 +210,8 @@ class NsDescriptor(object):
                 if vnfd_id == "undefined":
                     vnfd_id = vnf["properties"].get("id", "undefined")
                 pkgs = VnfPackageModel.objects.filter(vnfdId=vnfd_id)
+                if not pkgs:
+                    pkgs = VnfPackageModel.objects.filter(vnfPackageId=vnfd_id)
                 for pkg in pkgs:
                     vnf_pkg_ids.append(pkg.vnfPackageId)
             data['vnfPkgIds'] = vnf_pkg_ids
@@ -216,6 +222,8 @@ class NsDescriptor(object):
                 if pnfd_id == "undefined":
                     pnfd_id = pnf["properties"].get("id", "undefined")
                 pkgs = PnfPackageModel.objects.filter(pnfdId=pnfd_id)
+                if not pkgs:
+                    pkgs = PnfPackageModel.objects.filter(pnfPackageId=pnfd_id)
                 for pkg in pkgs:
                     pnf_info_ids.append(pkg.pnfPackageId)
             data['pnfInfoIds'] = pnf_info_ids  # TODO: need reconfirming