Fix vfc-catalog convert bug

Change-Id: Ie0117bef03c50f7b8c4d46c156c7a3a29805d217
Issue-ID: VFC-589
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 5474a47..4b7ec92 100644 (file)
--- a/catalog/packages/ns_package.py
+++ b/catalog/packages/ns_package.py
@@ -174,6 +174,7 @@ class NsPackage(object):
             package_info["nsdProvider"] = csars[0].nsdDesginer
             package_info["nsdVersion"] = csars[0].nsdVersion
             package_info["csarName"] = csars[0].nsPackageUri
+            package_info["nsdModel"] = csars[0].nsdModel
             package_info["downloadUrl"] = "http://%s:%s/%s/%s/%s" % (
                 REG_TO_MSB_REG_PARAM["nodes"][0]["ip"],
                 REG_TO_MSB_REG_PARAM["nodes"][0]["port"],

diff --git a/catalog/packages/tests/test_ns.py b/catalog/packages/tests/test_ns.py
index ceb5ac3..d4c6ce9 100644 (file)
--- a/catalog/packages/tests/test_ns.py
+++ b/catalog/packages/tests/test_ns.py
@@ -478,7 +478,8 @@ class TestNsPackage(TestCase):
         self.assertEqual(expect_data, resp.data)
 
     def test_ns_pkg_get_one(self):
-        NSPackageModel(nsPackageId="14", nsdId="2", nsdDesginer="3", nsdVersion="4", nsPackageUri="14.csar").save()
+        NSPackageModel(nsPackageId="14", nsdId="2", nsdDesginer="3", nsdVersion="4",
+                       nsPackageUri="14.csar", nsdModel="").save()
         resp = self.client.get("/api/catalog/v1/nspackages/14")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         expect_data = {
@@ -489,6 +490,7 @@ class TestNsPackage(TestCase):
                 "nsdProvider": "3",
                 "nsdVersion": "4",
                 "csarName": "14.csar",
+                "nsdModel": "",
                 "downloadUrl": "http://127.0.0.1:8806/static/catalog/14/14.csar"
             }
         }

diff --git a/catalog/pub/utils/toscaparser/nsdmodel.py b/catalog/pub/utils/toscaparser/nsdmodel.py
index e429188..fa8b841 100644 (file)
--- a/catalog/pub/utils/toscaparser/nsdmodel.py
+++ b/catalog/pub/utils/toscaparser/nsdmodel.py
@@ -89,8 +89,8 @@ class EtsiNsdInfoModel(BaseInfoModel):
                 for key in vnf['properties'].iterkeys():
                     if key.endswith('_version'):
                         vnf['properties'].update(version=vnf['properties'].pop(key))
-                    # if key.endswith('_id'):
-                    #     vnf['properties'].update(id=vnf['properties'].pop(key))
+                    if key.endswith('_id'):
+                        vnf['properties'].update(id=vnf['properties'].pop(key))
                     if key.endswith('_csarProvider'):
                         vnf['properties'].update(csarProvider=vnf['properties'].pop(key))
                     if key.endswith('_csarVersion'):