Dealing with test related stuffs.

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / biz / query_vnf.py

diff --git a/lcm/lcm/nf/biz/query_vnf.py b/lcm/lcm/nf/biz/query_vnf.py
index 1a6bdd9..09fab6c 100644 (file)
--- a/lcm/lcm/nf/biz/query_vnf.py
+++ b/lcm/lcm/nf/biz/query_vnf.py
@@ -29,14 +29,14 @@ class QueryVnf:
     def query_single_vnf(self):
         vnf_inst = NfInstModel.objects.filter(nfinstid=self.vnf_inst_id)
         if not vnf_inst.exists():
-            raise NFLCMException('VnfInst(%s) does not exist' % self.vnf_inst_id)
+            raise NFLCMException('VnfInst(%s) does not exist.' % self.vnf_inst_id)
         resp_data = self.fill_resp_data(vnf_inst[0])
         return resp_data
 
     def query_multi_vnf(self):
         vnf_insts = NfInstModel.objects.all()
         if not vnf_insts:
-            raise NFLCMException('VnfInsts does not exist')
+            raise NFLCMException('VnfInsts does not exist.')
         resp_data = []
         for vnf_inst in vnf_insts:
             resp_data.append(self.fill_resp_data(vnf_inst))
@@ -48,9 +48,9 @@ class QueryVnf:
         arr = []
         for s in storage_inst:
             storage = {
-                "virtualStorageInstanceId": s.storageid,
+                "id": s.storageid,
                 "storageResource": {
-                    "vimId": s.vimid,
+                    "vimConnectionId": s.vimid,
                     "resourceId": s.resouceid
                 }
             }
@@ -63,10 +63,10 @@ class QueryVnf:
             if not net:
                 raise NFLCMException('NetworkInst(%s) does not exist.' % v.relatednetworkid)
             v_dic = {
-                "virtualLinkInstanceId": v.vlinstanceid,
+                "id": v.vlinstanceid,
                 "virtualLinkDescId": v.vldid,
                 "networkResource": {
-                    "vimId": net[0].vimid,
+                    "vimConnectionId": net[0].vimid,
                     "resourceId": net[0].resouceid
                 }
             }
@@ -78,61 +78,38 @@ class QueryVnf:
             vm = VmInstModel.objects.filter(vmid=vnfc.vmid)
             if not vm:
                 raise NFLCMException('VmInst(%s) does not exist.' % vnfc.vmid)
-            storage = StorageInstModel.objects.filter(ownerid=vm[0].vmid)
+            storage = StorageInstModel.objects.filter(vimid=vm[0].vmid)
+            # TODO: previously, ownerid=vm[0].vmid, but ownerid is not a field of StorageInstModel.
             if not storage:
                 raise NFLCMException('StorageInst(%s) does not exist.' % vm[0].vmid)
             vnfc_dic = {
-                "vnfcInstanceId": vnfc.vnfcinstanceid,
+                "id": vnfc.vnfcinstanceid,
                 "vduId": vnfc.vduid,
                 "computeResource": {
-                    "vimId": vm[0].vimid,
+                    "vimConnectionId": vm[0].vimid,
                     "resourceId": vm[0].resouceid
                 },
                 "storageResourceIds": [s.storageid for s in storage]
             }
             vnfc_arr.append(vnfc_dic)
         logger.info('Get vms')
-        vms = VmInstModel.objects.filter(instid=vnf.nfinstid)
-        vm_arr = []
-        for vm in vms:
-            vm_dic = {
-                "vmid": vm.vmid,
-                "vimid": vm.vimid,
-                "tenant": vm.tenant,
-                "resouceid": vm.resouceid,
-                "vmname": vm.vmname,
-                "nic_array": vm.nic_array,
-                "metadata": vm.metadata,
-                "volume_array": vm.volume_array,
-                "server_group": vm.server_group,
-                "availability_zone": vm.availability_zone,
-                "flavor_id": vm.flavor_id,
-                "security_groups": vm.security_groups,
-                "operationalstate": vm.operationalstate,
-                "insttype": vm.insttype,
-                "is_predefined": vm.is_predefined,
-                "create_time": vm.create_time,
-                "instid": vm.instid,
-                "nodeId": vm.nodeId
-            }
-            vm_arr.append(vm_dic)
 
         resp_data = {
-            "vnfInstanceId": vnf.nfinstid,
+            "id": vnf.nfinstid,
             "vnfInstanceName": vnf.nf_name,
-            "onboardedVnfPkgInfoId": vnf.package_id,
+            "vnfPkgId": vnf.package_id,
             "vnfdVersion": vnf.version,
             "vnfProvider": vnf.vendor,
+            "instantiationState": vnf.status,
             "instantiatedVnfInfo": {
                 "flavourId": vnf.flavour_id,
-                "vnfState": vnf.status,
+                "vnfState": "STARTED",
                 "scaleStatus": [],
                 "extCpInfo": [],
-                "extVirtualLink": [],
+                "extVirtualLinkInfo": [],
                 "monitoringParameters": {},
-                "vimInfo": vm_arr,
                 "vnfcResourceInfo": vnfc_arr,
-                "virtualLinkResourceInfo": vl_arr,
+                "vnfVirtualLinkResourceInfo": vl_arr,
                 "virtualStorageResourceInfo": arr
             }
         }