aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-09-27 17:29:31 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2017-09-27 17:29:31 +0800
commitefe189710967bf5b7bcf8158c2de82ad9c9f0d0e (patch)
tree3fde288304431ab20ca45d83f814b2aa1d509f86
parentd688679208daffc517702f8cf76743e64d21dfb5 (diff)
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>
-rw-r--r--catalog/packages/ns_package.py1
-rw-r--r--catalog/packages/tests/test_ns.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py
index db080484..c12b1b66 100644
--- 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 f76886c9..ceb5ac31 100644
--- 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",