X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_query.py;h=bc88b95cb065e4e290e247cdc875470ceff61cf4;hb=3282ed39a71c360abb21f06636ab58b22c47b5ec;hp=9e7490a724d661abbfba55bbdaac7c54ca3dab85;hpb=89d8c84975086a670864fdf3e84e26c83280fab2;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_query.py b/lcm/lcm/nf/vnfs/tests/test_vnf_query.py
index 9e7490a7..bc88b95c 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_query.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_query.py
@@ -22,7 +22,7 @@ class ResourceTest(TestCase):
         self.client = Client()
         self.nf_inst_id = "01"
         NfInstModel.objects.all().delete()
-        self.test_data = {
+        self.test_data_single_vnf = {
             "vnfInstanceId": "1",
             "vnfInstanceName": "VNF1",
             "vnfProvider": None,
@@ -49,6 +49,62 @@ class ResourceTest(TestCase):
             "vnfdVersion": None,
             "onboardedVnfPkgInfoId": None
         }
+        self.test_data_multi_vnf = [
+        {
+            "vnfInstanceId": "1",
+            "vnfInstanceName": "VNF1",
+            "vnfProvider": None,
+            "instantiatedVnfInfo": {
+                "vnfState": None,
+                "extCpInfo": [],
+                "virtualStorageResourceInfo": [
+                    {
+                        "virtualStorageInstanceId": "s01",
+                        "storageResource": {
+                            "resourceId": "resource01",
+                            "vimId": "vim01"
+                        }
+                    }
+                ],
+                "extVirtualLink": [],
+                "vnfcResourceInfo": [],
+                "monitoringParameters": {},
+                "vimInfo": [],
+                "flavourId": None,
+                "virtualLinkResourceInfo": [],
+                "scaleStatus": []
+            },
+            "vnfdVersion": None,
+            "onboardedVnfPkgInfoId": None
+        },
+        {
+            "vnfInstanceId": "2",
+            "vnfInstanceName": "VNF2",
+            "vnfProvider": None,
+            "instantiatedVnfInfo": {
+                "vnfState": None,
+                "extCpInfo": [],
+                "virtualStorageResourceInfo": [
+                    {
+                        "virtualStorageInstanceId": "s02",
+                        "storageResource": {
+                            "resourceId": "resource02",
+                            "vimId": "vim02"
+                        }
+                    }
+                ],
+                "extVirtualLink": [],
+                "vnfcResourceInfo": [],
+                "monitoringParameters": {},
+                "vimInfo": [],
+                "flavourId": None,
+                "virtualLinkResourceInfo": [],
+                "scaleStatus": []
+            },
+            "vnfdVersion": None,
+            "onboardedVnfPkgInfoId": None
+        }
+    ]
 
     def tearDown(self):
         pass
@@ -60,4 +116,13 @@ class ResourceTest(TestCase):
                          instid=vnf_inst_id).save()
         response = self.client.get("/openoapi/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(self.test_data, response.data)
\ No newline at end of file
+        self.assertEqual(self.test_data_single_vnf, response.data)
+
+    def test_get_vnfs(self):
+        for i in range(1,3):
+            NfInstModel(nfinstid='%s' % i, nf_name='VNF%s' % i).save()
+            StorageInstModel(storageid='s0%s' % i, vimid='vim0%s' % i, resouceid='resource0%s' % i,
+                             insttype=1, instid='%s' % i).save()
+        response = self.client.get("/openoapi/vnflcm/v1/vnf_instances")
+        self.failUnlessEqual(status.HTTP_200_OK, response.status_code)
+        self.assertEqual(self.test_data_multi_vnf, response.data)
\ No newline at end of file