Fix code and interface inconsistencies

Modify query all vnf csars code and Interface inconsistencies

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

diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py
index a5ca10b..55de809 100644 (file)
--- a/catalog/packages/nf_package.py
+++ b/catalog/packages/nf_package.py
@@ -204,13 +204,11 @@ class NfPackage(object):
         pass
 
     def get_csars(self):
-        csars = {"csars": []}
+        csars = []
         nf_pkgs = VnfPackageModel.objects.filter()
         for nf_pkg in nf_pkgs:
-            csars["csars"].append({
-                "csarId": nf_pkg.vnfPackageId,
-                "vnfdId": nf_pkg.vnfdId
-            })
+            ret = self.get_csar(nf_pkg.vnfPackageId)
+            csars.append(ret[1])
         return [0, csars]
 
     def get_csar(self, csar_id):
@@ -236,6 +234,9 @@ class NfPackage(object):
         else:
             raise CatalogException("Vnf package[%s] not Found." % csar_id)
 
-        return [0, {"csarId": csar_id,
-                    "packageInfo": pkg_info,
-                    "imageInfo": []}]
+        csar_info = {
+            "csarId": csar_id,
+            "packageInfo": pkg_info,
+            "imageInfo": []
+        }
+        return [0, csar_info]

diff --git a/catalog/packages/tests/test_nf.py b/catalog/packages/tests/test_nf.py
index 51df09b..4a7495c 100644 (file)
--- a/catalog/packages/tests/test_nf.py
+++ b/catalog/packages/tests/test_nf.py
@@ -311,39 +311,63 @@ class TestNfPackage(TestCase):
         self.assert_job_result("2", 100, "Delete CSAR(2) successfully.")
 
     def test_nf_pkg_get_all(self):
-        VnfPackageModel(vnfPackageId="3", vnfdId="4").save()
-
+        VnfPackageModel(vnfPackageId="3", vnfdId="3", vnfVendor='3', vnfdVersion='3',
+                        vnfSoftwareVersion='', vnfPackageUri='', vnfdModel='').save()
+        VnfPackageModel(vnfPackageId="4", vnfdId="4", vnfVendor='4', vnfdVersion='4',
+                        vnfSoftwareVersion='', vnfPackageUri='', vnfdModel='').save()
         resp = self.client.get("/api/catalog/v1/vnfpackages")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        expect_data = {
-            "csars": [
-                {
-                    "csarId": "3",
-                    "vnfdId": "4"
+        expect_data = [
+            {
+                "imageInfo": [],
+                "csarId": "3",
+                "packageInfo": {
+                    "csarName": "",
+                    "vnfdModel": "",
+                    "vnfdProvider": "3",
+                    "vnfdId": "3",
+                    "downloadUrl": "http://127.0.0.1:8806/static/catalog/3/",
+                    "vnfVersion": "",
+                    "vnfdVersion": "3",
+                    "vnfPackageId": "3"
                 }
-            ]
-        }
+            },
+            {
+                "imageInfo": [],
+                "csarId": "4",
+                "packageInfo": {
+                    "csarName": "",
+                    "vnfdModel": "",
+                    "vnfdProvider": "4",
+                    "vnfdId": "4",
+                    "downloadUrl": "http://127.0.0.1:8806/static/catalog/4/",
+                    "vnfVersion": "",
+                    "vnfdVersion": "4",
+                    "vnfPackageId": "4"
+                }
+            }
+        ]
         self.assertEqual(expect_data, resp.data)
 
     def test_nf_pkg_get_one(self):
-        VnfPackageModel(vnfPackageId="4", vnfdId="5", vnfVendor="6",
-                        vnfdVersion="7", vnfSoftwareVersion="8", vnfPackageUri="4.csar").save()
+        VnfPackageModel(vnfPackageId="4", vnfdId="4", vnfVendor='4', vnfdVersion='4',
+                        vnfSoftwareVersion='', vnfPackageUri='', vnfdModel='').save()
 
         resp = self.client.get("/api/catalog/v1/vnfpackages/4")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         expect_data = {
+            "imageInfo": [],
             "csarId": "4",
             "packageInfo": {
-                "vnfdId": "5",
-                "vnfPackageId": "4",
-                "vnfdProvider": "6",
-                "vnfdVersion": "7",
-                "vnfVersion": "8",
-                "vnfdModel": None,
-                "csarName": "4.csar",
-                "downloadUrl": "http://127.0.0.1:8806/static/catalog/4/4.csar"
-            },
-            "imageInfo": []
+                "csarName": "",
+                "vnfdModel": "",
+                "vnfdProvider": "4",
+                "vnfdId": "4",
+                "downloadUrl": "http://127.0.0.1:8806/static/catalog/4/",
+                "vnfVersion": "",
+                "vnfdVersion": "4",
+                "vnfPackageId": "4"
+            }
         }
         self.assertEqual(expect_data, resp.data)