From: biancunkang <bian.cunkang@zte.com.cn>
Date: Thu, 23 Aug 2018 06:12:34 +0000 (+0800)
Subject: Deal with nfPackage
X-Git-Tag: 1.2.0~83^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f0ae94dd427c1ff9e844c562c223e91421a98e13;p=vfc%2Fnfvo%2Fcatalog.git

Deal with nfPackage

Change-Id: I537b83667ce948a452eca69274349482bb3daae5
Issue-ID: VFC-1038
Signed-off-by: biancunkang <bian.cunkang@zte.com.cn>
---

diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py
index da17a61c..aa8ee5af 100644
--- a/catalog/packages/biz/vnf_package.py
+++ b/catalog/packages/biz/vnf_package.py
@@ -63,16 +63,25 @@ def query_multiple():
 
 
 def query_single(vnfPkgId):
-    # TODO
-    data = {
-        "id": "1",
-        "onboardingState": "CREATED",
-        "operationalState": "DISABLED",
-        "usageState": "NOT_IN_USE",
-        "userDefinedData": "1",
-        "_links": None
-    }
-    return data
+    pkg_info = {}
+    nf_pkg = VnfPackageModel.objects.filter(vnfPackageId=vnfPkgId)
+    if not nf_pkg.exists():
+        raise CatalogException('VNF package(%s) does not exist.' % vnfPkgId)
+    pkg_info["id"] = nf_pkg[0].vnfPackageId
+    pkg_info["vnfdId"] = nf_pkg[0].vnfdId
+    pkg_info["vnfdProvider"] = nf_pkg[0].vnfVendor
+    pkg_info["vnfProductName"] = nf_pkg[0].vnfdProductName
+    pkg_info["vnfSoftwareVersion"] = nf_pkg[0].vnfSoftwareVersion
+    pkg_info["vnfdVersion"] = nf_pkg[0].vnfdVersion
+    pkg_info["checksum"] = nf_pkg[0].checksum
+    pkg_info["softwareImages"] = ""  # TODO
+    pkg_info["additionalArtifacts"] = ""  # TODO
+    pkg_info["onboardingState"] = nf_pkg[0].onboardingState
+    pkg_info["operationalState"] = nf_pkg[0].operationalState
+    pkg_info["usageState"] = nf_pkg[0].usageState
+    pkg_info["userDefinedData"] = nf_pkg[0].userDefinedData
+    pkg_info["_links"] = ""  # TODO
+    return pkg_info
 
 
 def delete_single(vnfPkgId):