From: fujinhua <fu.jinhua@zte.com.cn>
Date: Tue, 19 Mar 2019 08:32:56 +0000 (+0800)
Subject: Fix bug for vnf pkg get
X-Git-Tag: 1.3.0~72
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F82643%2F1;p=vfc%2Fnfvo%2Fcatalog.git

Fix bug for vnf pkg get

Change-Id: I6a14dccba3fc84fa380acb76680fdd7280674892
Issue-ID: VFC-1306
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/catalog/packages/biz/sdc_vnf_package.py b/catalog/packages/biz/sdc_vnf_package.py
index bcb3ca06..71eee499 100644
--- a/catalog/packages/biz/sdc_vnf_package.py
+++ b/catalog/packages/biz/sdc_vnf_package.py
@@ -229,6 +229,7 @@ class NfPackage(object):
             nf_pkg = VnfPackageModel.objects.filter(vnfdId=csar_id)
 
         if nf_pkg:
+            db_csar_id = nf_pkg[0].vnfPackageId
             pkg_info["vnfdId"] = nf_pkg[0].vnfdId
             pkg_info["vnfPackageId"] = nf_pkg[0].vnfPackageId
             pkg_info["vnfdProvider"] = nf_pkg[0].vnfVendor
@@ -240,13 +241,13 @@ class NfPackage(object):
                 REG_TO_MSB_REG_PARAM[0]["nodes"][0]["ip"],
                 REG_TO_MSB_REG_PARAM[0]["nodes"][0]["port"],
                 CATALOG_URL_PATH,
-                csar_id,
+                db_csar_id,
                 nf_pkg[0].vnfPackageUri)
         else:
             raise CatalogException("Vnf package[%s] not Found." % csar_id)
 
         csar_info = {
-            "csarId": csar_id,
+            "csarId": db_csar_id,
             "packageInfo": pkg_info,
             "imageInfo": []
         }