From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Wed, 18 Oct 2017 02:54:45 +0000 (+0800)
Subject: Fix vfc-catalog query vnf package info
X-Git-Tag: v1.0.1~10
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a851bdb93648e5e9935fd119498a1b3d80064de2;p=vfc%2Fnfvo%2Fcatalog.git

Fix vfc-catalog query vnf package info

Change-Id: If6dd008199795ab808acd5c4995b843476708b5f
Issue-ID: VFC-539
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py
index 7e9336bb..5b4a9a76 100644
--- a/catalog/packages/nf_package.py
+++ b/catalog/packages/nf_package.py
@@ -208,6 +208,9 @@ class NfPackage(object):
     def get_csar(self, csar_id):
         pkg_info = {}
         nf_pkg = VnfPackageModel.objects.filter(vnfPackageId=csar_id)
+        if not nf_pkg:
+            nf_pkg = VnfPackageModel.objects.filter(vnfdId=csar_id)
+
         if nf_pkg:
             pkg_info["vnfdId"] = nf_pkg[0].vnfdId
             pkg_info["vnfPackageId"] = nf_pkg[0].vnfPackageId