Modify vfc-catalog query package interface

Modify query ns and VNF interface return information in vfc-nfvo-catalog.

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

diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py
index db08048..c12b1b6 100644 (file)
--- a/catalog/packages/ns_package.py
+++ b/catalog/packages/ns_package.py
@@ -168,6 +168,7 @@ class NsPackage(object):
         csars = NSPackageModel.objects.filter(nsPackageId=csar_id)
         if csars:
             package_info["nsdId"] = csars[0].nsdId
+            package_info["nsPackageId"] = csars[0].nsPackageId
             package_info["nsdProvider"] = csars[0].nsdDesginer
             package_info["nsdVersion"] = csars[0].nsdVersion
             package_info["csarName"] = csars[0].nsPackageUri

diff --git a/catalog/packages/tests/test_ns.py b/catalog/packages/tests/test_ns.py
index f76886c..ceb5ac3 100644 (file)
--- a/catalog/packages/tests/test_ns.py
+++ b/catalog/packages/tests/test_ns.py
@@ -485,6 +485,7 @@ class TestNsPackage(TestCase):
             "csarId": "14",
             "packageInfo": {
                 "nsdId": "2",
+                "nsPackageId": "14",
                 "nsdProvider": "3",
                 "nsdVersion": "4",
                 "csarName": "14.csar",