Change in vnflcm

[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 e23d5ef..1fc0506 100644 (file)
--- a/lcm/lcm/nf/biz/terminate_vnf.py
+++ b/lcm/lcm/nf/biz/terminate_vnf.py
@@ -14,11 +14,12 @@
 
 import json
 import logging
+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, NfvoRegInfoModel, FlavourInstModel, SubNetworkInstModel
+    PortInstModel, VNFCInstModel, FlavourInstModel, SubNetworkInstModel
 from lcm.pub.exceptions import NFLCMException
 from lcm.pub.msapi.gvnfmdriver import apply_grant_to_nfvo, notify_lcm_to_nfvo
 from lcm.pub.utils.jobutil import JobUtil
@@ -40,6 +41,7 @@ class TerminateVnf(Thread):
         self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], 'flavor': [], 'vm': []}
 
     def run(self):
+        try:
             if self.term_pre():
                 self.grant_resource()
                 self.query_inst_resource()
@@ -47,6 +49,11 @@ class TerminateVnf(Thread):
                 self.delete_resource()
                 self.lcm_notify()
             JobUtil.add_job_status(self.job_id, 100, "Terminate Vnf success.")
+        except NFLCMException as e:
+            self.vnf_term_failed_handle(e.message)
+        except Exception as e:
+            logger.error(e.message)
+            self.vnf_term_failed_handle(traceback.format_exc())
 
     def term_pre(self):
         vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
@@ -67,7 +74,7 @@ class TerminateVnf(Thread):
             'vnfInstanceId': self.nf_inst_id,
             'vnfDescriptorId': '',
             'lifecycleOperation': 'Terminate',
-            'jobId': self.job_id,
+            'vnfLcmOpOccId': self.job_id,
             'addResource': [],
             'removeResource': [],
             'placementConstraint': [],
@@ -84,11 +91,9 @@ class TerminateVnf(Thread):
             content_args['removeResource'].append(res_def)
             res_index += 1
 
-        vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id)
-        if len(vnfmInfo) == 0:
-            raise NFLCMException('VnfId(%s) does not exist' % self.nf_inst_id)
-        content_args['additionalParam']['vnfmid'] = vnfmInfo[0].vnfminstid
-        content_args['additionalParam']['vimid'] = vnfmInfo[0].apiurl
+        vnfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
+        content_args['additionalParam']['vnfmid'] = vnfInsts[0].vnfminstid
+        content_args['additionalParam']['vimid'] = vdus[0].vimid
         logger.info('Grant request data=%s' % content_args)
         self.apply_result = apply_grant_to_nfvo(json.dumps(content_args))
         logger.info("Grant resource end, response: %s" % self.apply_result)
@@ -172,10 +177,8 @@ class TerminateVnf(Thread):
             'affectedVirtualStorage': affected_vs,
             'affectedCp': affected_cp}
 
-        vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id)
-        if len(vnfmInfo) == 0:
-            raise NFLCMException('VnfId(%s) does not exist' % self.nf_inst_id)
-        self.notify_data['VNFMID'] = vnfmInfo[0].vnfminstid
+        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):
@@ -194,3 +197,8 @@ class TerminateVnf(Thread):
         logger.info('Send notify request to nfvo')
         resp = notify_lcm_to_nfvo(json.dumps(self.notify_data))
         logger.info('Lcm notify end, response: %s' % resp)
+
+    def vnf_term_failed_handle(self, error_msg):
+        logger.error('VNF termination failed, detail message: %s' % error_msg)
+        NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='failed', lastuptime=now_time())
+        JobUtil.add_job_status(self.job_id, 255, error_msg)