X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Ftests%2Ftest_query_vnf.py;h=88d4402b81f37d935781c1953a5e5ab6d8158330;hb=e1ce061efe39b054d0d7a1259d5d5f420900fdb7;hp=95f387b9a25935fa1f80d04377929f80bb185033;hpb=c33814b49eaad9d9d7468149b5eb1b5c0b3ccccc;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/tests/test_query_vnf.py b/lcm/lcm/nf/tests/test_query_vnf.py
index 95f387b9..88d4402b 100644
--- a/lcm/lcm/nf/tests/test_query_vnf.py
+++ b/lcm/lcm/nf/tests/test_query_vnf.py
@@ -27,7 +27,13 @@ class ResourceTest(TestCase):
         self.test_data_single_vnf = {
             "id": "1",
             "vnfInstanceName": "VNF1",
-            "vnfProvider": None,
+            "vnfInstanceDescription": "VNF DESC",
+            "vnfdId": "1",
+            "vnfProvider": "ZTE",
+            "vnfProductName": "XGW",
+            "vnfSoftwareVersion": "V1",
+            "vnfdVersion": "V1",
+            "vnfPkgId": "2",
             "instantiationState": "INSTANTIATED",
             "instantiatedVnfInfo": {
                 "vnfState": "STARTED",
@@ -43,19 +49,23 @@ class ResourceTest(TestCase):
                 ],
                 "extVirtualLinkInfo": [],
                 "vnfcResourceInfo": [],
-                "monitoringParameters": {},
+                "monitoringParameters": [],
                 "flavourId": None,
                 "vnfVirtualLinkResourceInfo": [],
                 "scaleStatus": []
-            },
-            "vnfdVersion": None,
-            "vnfPkgId": None
+            }
         }
         self.test_data_multi_vnf = [
             {
                 "id": "1",
                 "vnfInstanceName": "VNF1",
-                "vnfProvider": None,
+                "vnfInstanceDescription": "VNF DESC",
+                "vnfdId": "1",
+                "vnfProvider": "ZTE",
+                "vnfProductName": "XGW",
+                "vnfSoftwareVersion": "V1",
+                "vnfdVersion": "V1",
+                "vnfPkgId": "2",
                 "instantiationState": "INSTANTIATED",
                 "instantiatedVnfInfo": {
                     "vnfState": "STARTED",
@@ -71,18 +81,22 @@ class ResourceTest(TestCase):
                     ],
                     "extVirtualLinkInfo": [],
                     "vnfcResourceInfo": [],
-                    "monitoringParameters": {},
+                    "monitoringParameters": [],
                     "flavourId": None,
                     "vnfVirtualLinkResourceInfo": [],
                     "scaleStatus": []
-                },
-                "vnfdVersion": None,
-                "vnfPkgId": None
+                }
             },
             {
                 "id": "2",
                 "vnfInstanceName": "VNF2",
-                "vnfProvider": None,
+                "vnfInstanceDescription": "VNF DESC",
+                "vnfdId": "1",
+                "vnfProvider": "ZTE",
+                "vnfProductName": "XGW",
+                "vnfSoftwareVersion": "V1",
+                "vnfdVersion": "V1",
+                "vnfPkgId": "2",
                 "instantiationState": "INSTANTIATED",
                 "instantiatedVnfInfo": {
                     "vnfState": "STARTED",
@@ -98,13 +112,11 @@ class ResourceTest(TestCase):
                     ],
                     "extVirtualLinkInfo": [],
                     "vnfcResourceInfo": [],
-                    "monitoringParameters": {},
+                    "monitoringParameters": [],
                     "flavourId": None,
                     "vnfVirtualLinkResourceInfo": [],
                     "scaleStatus": []
-                },
-                "vnfdVersion": None,
-                "vnfPkgId": None
+                }
             }
         ]
 
@@ -113,10 +125,19 @@ class ResourceTest(TestCase):
 
     def test_get_vnf(self):
         vnf_inst_id = "1"
-        NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save()
+        NfInstModel(nfinstid=vnf_inst_id,
+                    nf_name='VNF1',
+                    nf_desc="VNF DESC",
+                    vnfdid="1",
+                    netype="XGW",
+                    vendor="ZTE",
+                    vnfSoftwareVersion="V1",
+                    version="V1",
+                    package_id="2",
+                    status='INSTANTIATED').save()
         StorageInstModel(storageid='s02',
                          vimid='vim01',
-                         resouceid='resource01',
+                         resourceid='resource01',
                          insttype=1,
                          instid=vnf_inst_id).save()
         response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
@@ -152,16 +173,22 @@ class ResourceTest(TestCase):
         VmInstModel(vmid='x', insttype='0').save()
         response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
         self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-        self.assertEqual({'error': 'StorageInst(x) does not exist.'}, response.data)
 
     def test_get_vnfs(self):
         for i in range(1, 3):
             NfInstModel(nfinstid='%s' % i,
                         nf_name='VNF%s' % i,
+                        nf_desc="VNF DESC",
+                        vnfdid="1",
+                        netype="XGW",
+                        vendor="ZTE",
+                        vnfSoftwareVersion="V1",
+                        version="V1",
+                        package_id="2",
                         status='INSTANTIATED').save()
             StorageInstModel(storageid='s0%s' % i,
                              vimid='vim0%s' % i,
-                             resouceid='resource0%s' % i,
+                             resourceid='resource0%s' % i,
                              insttype=1,
                              instid='%s' % i).save()
         response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json')
@@ -170,5 +197,4 @@ class ResourceTest(TestCase):
 
     def test_get_vnfs_not_exist(self):
         response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json')
-        self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-        self.assertEqual({'error': 'VnfInsts does not exist.'}, response.data)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)