Update return value of ns pkg list

Change-Id: Ieb83199e64e66c534a56d1de8879300a06994a2c
Issue-Id: VFC-433
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py
index 318c095..7095088 100644 (file)
--- a/catalog/packages/ns_package.py
+++ b/catalog/packages/ns_package.py
@@ -18,7 +18,8 @@ import os
 import sys
 import traceback
 
-from catalog.pub.config.config import CATALOG_ROOT_PATH
+from catalog.pub.config.config import CATALOG_ROOT_PATH, CATALOG_URL_PATH
+from catalog.pub.config.config import REG_TO_MSB_REG_PARAM
 from catalog.pub.database.models import NSPackageModel, VnfPackageModel
 from catalog.pub.exceptions import CatalogException
 from catalog.pub.msapi import sdc
@@ -166,9 +167,13 @@ class NsPackage(object):
             package_info["nsdId"] = csars[0].nsdId
             package_info["nsdProvider"] = csars[0].nsdDesginer
             package_info["nsdVersion"] = csars[0].nsdVersion
+            package_info["downloadUrl"] = "http://%s:%s/%s/%s" % (
+                REG_TO_MSB_REG_PARAM["nodes"][0]["ip"],
+                REG_TO_MSB_REG_PARAM["nodes"][0]["port"],
+                CATALOG_URL_PATH,
+                csars[0].nsPackageUri)
 
-        return [0, {"csarId": csar_id, 
-            "packageInfo": package_info}]
+        return [0, {"csarId": csar_id, "packageInfo": package_info}]
 
     def delete_catalog(self, csar_id):
         local_path = os.path.join(CATALOG_ROOT_PATH, csar_id)

diff --git a/catalog/packages/tests/test_ns.py b/catalog/packages/tests/test_ns.py
index 3f855af..f1da355 100644 (file)
--- a/catalog/packages/tests/test_ns.py
+++ b/catalog/packages/tests/test_ns.py
@@ -467,7 +467,8 @@ class TestNsPackage(TestCase):
         self.assertEqual({"csars": [{"csarId":"13", "nsdId": "2"}]}, resp.data)
 
     def test_ns_pkg_get_one(self):
-        NSPackageModel(nsPackageId="14", nsdId="2", nsdDesginer="3", nsdVersion="4").save()
+        NSPackageModel(nsPackageId="14", nsdId="2", nsdDesginer="3", 
+            nsdVersion="4", nsPackageUri="14/14.csar").save()
 
         resp = self.client.get("/api/catalog/v1/nspackages/14")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
@@ -475,7 +476,8 @@ class TestNsPackage(TestCase):
             "packageInfo": {
                 "nsdId": "2",
                 "nsdProvider": "3",
-                "nsdVersion": "4"
+                "nsdVersion": "4",
+                "downloadUrl": "http://127.0.0.1:8806/static/catalog/14/14.csar"
             }}, resp.data)