Deal with gvnfm adapter stuffs.

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

diff --git a/lcm/lcm/nf/biz/terminate_vnf.py b/lcm/lcm/nf/biz/terminate_vnf.py
index 271fc3f..d63cdfa 100644 (file)
--- a/lcm/lcm/nf/biz/terminate_vnf.py
+++ b/lcm/lcm/nf/biz/terminate_vnf.py
@@ -18,10 +18,13 @@ import traceback
 from threading import Thread
 
 from lcm.nf.const import VNF_STATUS, RESOURCE_MAP
-from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \
-    PortInstModel, VNFCInstModel, FlavourInstModel, SubNetworkInstModel
+from lcm.pub.database.models import (
+    NfInstModel, VmInstModel, NetworkInstModel,
+    StorageInstModel, PortInstModel, VNFCInstModel,
+    FlavourInstModel, SubNetworkInstModel
+)
 from lcm.pub.exceptions import NFLCMException
-from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo
+from lcm.pub.msapi.gvnfmdriver import prepare_notification_data, notify_lcm_to_nfvo
 from lcm.pub.utils.jobutil import JobUtil
 from lcm.pub.utils.timeutil import now_time
 from lcm.pub.utils.values import ignore_case_get
@@ -94,67 +97,13 @@ class TerminateVnf(Thread):
         }
 
     def query_notify_data(self):
-        logger.info('Send notify request to nfvo')
-        affected_vnfc = []
-        vnfcs = VNFCInstModel.objects.filter(instid=self.nf_inst_id)
-        for vnfc in vnfcs:
-            vm_resource = {}
-            if vnfc.vmid:
-                vm = VmInstModel.objects.filter(vmid=vnfc.vmid)
-                if vm:
-                    vm_resource = {'vimId': vm[0].vimid, 'resourceId': vm[0].resouceid,
-                                   'resourceName': vm[0].vmname, 'resourceType': 'vm'}
-            affected_vnfc.append(
-                {'vnfcInstanceId': vnfc.vnfcinstanceid,
-                 'vduId': vnfc.vduid,
-                 'changeType': 'removed',
-                 'computeResource': vm_resource})
-        affected_vl = []
-        networks = NetworkInstModel.objects.filter(instid=self.nf_inst_id)
-        for network in networks:
-            network_resource = {
-                'vimId': network.vimid,
-                'resourceId': network.resouceid,
-                'resourceName': network.name,
-                'resourceType': 'network'}
-            affected_vl.append(
-                {'vlInstanceId': network.networkid,
-                 'vldid': network.nodeId,
-                 'changeType': 'removed',
-                 'networkResource': network_resource})
-        affected_cp = []
-        ports = PortInstModel.objects.filter(instid=self.nf_inst_id)
-        for port in ports:
-            affected_cp.append(
-                {'vsInstanceId': port.portid,
-                 'cpdid': port.nodeId,
-                 'changeType': 'removed',
-                 'storageResource': {'vimId': port.vimid, 'resourceId': port.resouceid,
-                                     'resourceName': port.name, 'resourceType': 'port'}})
-        affected_vs = []
-        vss = StorageInstModel.objects.filter(instid=self.nf_inst_id)
-        for vs in vss:
-            affected_vs.append(
-                {'vsInstanceId': vs.storageid,
-                 'vsdId': vs.nodeId,
-                 'changeType': 'removed',
-                 'storageResource': {'vimId': vs.vimid, 'resourceId': vs.resouceid,
-                                     'resourceName': vs.name, 'resourceType': 'volume'}})
+        self.notify_data = prepare_notification_data(self.nf_inst_id, self.job_id, "RMOVED")
+        NetworkInstModel.objects.filter(instid=self.nf_inst_id)
+        StorageInstModel.objects.filter(instid=self.nf_inst_id)
+        PortInstModel.objects.filter(instid=self.nf_inst_id)
+        VNFCInstModel.objects.filter(instid=self.nf_inst_id)
         FlavourInstModel.objects.filter(instid=self.nf_inst_id)
         SubNetworkInstModel.objects.filter(instid=self.nf_inst_id)
-        self.notify_data = {
-            "status": 'result',
-            "vnfInstanceId": self.nf_inst_id,
-            "operation": 'Terminal',
-            "jobId": self.job_id,
-            'affectedVnfc': affected_vnfc,
-            'affectedVirtualLink': affected_vl,
-            'affectedVirtualStorage': affected_vs,
-            'affectedCp': affected_cp}
-
-        vnfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
-        self.notify_data['VNFMID'] = vnfInsts[0].vnfminstid
-        logger.info('Notify request data=%s' % self.notify_data)
 
     def delete_resource(self):
         logger.info('Rollback resource begin')