from lcm.pub.utils.jobutil import JobUtil
from lcm.pub.utils.values import ignore_case_get
from lcm.pub.utils import restcall
-from lcm.ns.const import OWNER_TYPE
+from lcm.ns.enum import OWNER_TYPE
from lcm.pub.database.models import PNFInstModel
-
-JOB_ERROR = 255
+from lcm.ns.biz.ns_lcm_op_occ import NsLcmOpOcc
+from lcm.pub.enum import JOB_PROGRESS
logger = logging.getLogger(__name__)
class TerminateNsService(threading.Thread):
- def __init__(self, ns_inst_id, terminate_type, terminate_timeout, job_id):
+ def __init__(self, ns_inst_id, job_id, request_data):
threading.Thread.__init__(self)
- self.ns_inst_id = ns_inst_id
- self.terminate_type = terminate_type
- self.terminate_timeout = terminate_timeout
+ self.terminate_type = request_data.get('terminationType', 'GRACEFUL')
+ self.terminate_timeout = request_data.get('gracefulTerminationTimeout', 600)
self.job_id = job_id
+ self.ns_inst_id = ns_inst_id
+ self.occ_id = NsLcmOpOcc.create(ns_inst_id, "TERMINATE", "PROCESSING", False, request_data)
def run(self):
try:
if not NSInstModel.objects.filter(id=self.ns_inst_id):
- JobUtil.add_job_status(self.job_id, 100, "Need not terminate.", '')
+ JobUtil.add_job_status(self.job_id, JOB_PROGRESS.FINISHED, "Need not terminate.", '')
+ NsLcmOpOcc.update(self.occ_id, "COMPLETED")
return
JobUtil.add_job_status(self.job_id, 10, "Starting terminate...", '')
self.cancel_pnf_list()
NSInstModel.objects.filter(id=self.ns_inst_id).update(status='null')
- JobUtil.add_job_status(self.job_id, 100, "ns terminate ends.", '')
+ JobUtil.add_job_status(self.job_id, JOB_PROGRESS.FINISHED, "ns terminate ends.", '')
+ NsLcmOpOcc.update(self.occ_id, "COMPLETED")
except NSLCMException as e:
- JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
- except Exception as ex:
- logger.error(ex.message)
+ JobUtil.add_job_status(self.job_id, JOB_PROGRESS.ERROR, e.message)
+ NsLcmOpOcc.update(self.occ_id, operationState="FAILED", error=e.message)
+ except Exception as e:
+ logger.error(e.message)
logger.error(traceback.format_exc())
- JobUtil.add_job_status(self.job_id, JOB_ERROR, "ns terminate fail.")
+ JobUtil.add_job_status(self.job_id, JOB_PROGRESS.ERROR, "ns terminate fail.")
+ NsLcmOpOcc.update(self.occ_id, operationState="FAILED", error=e.message)
def cancel_vl_list(self):
array_vlinst = VLInstModel.objects.filter(ownertype=OWNER_TYPE.NS, ownerid=self.ns_inst_id)
if not array_vnfinst:
logger.info("[cancel_vnf_list] no vnfinst attatch to ns_inst_id: %s" % self.ns_inst_id)
return
- step_progress = 20 / len(array_vnfinst)
+ step_progress = 10 / len(array_vnfinst)
cur_progress = 50
+ vnf_jobs = []
for vnfinst in array_vnfinst:
cur_progress += step_progress
delete_result = "failed"
+ vnf_job_id = ''
try:
- if self.delete_vnf(vnfinst.nfinstid):
- delete_result = "success"
+ vnf_job_id = self.delete_vnf(vnfinst.nfinstid)
+ if vnf_job_id:
+ delete_result = "deleting"
except Exception as e:
logger.error("[cancel_vnf_list] error[%s]!" % e.message)
logger.error(traceback.format_exc())
job_msg = "Delete vnfinst:[%s] %s." % (vnfinst.nfinstid, delete_result)
JobUtil.add_job_status(self.job_id, cur_progress, job_msg)
+ vnf_jobs.append((vnfinst.nfinstid, vnf_job_id))
+
+ for vnfinstid, vnfjobid in vnf_jobs:
+ try:
+ cur_progress += step_progress
+ if not vnfjobid:
+ continue
+ is_job_ok = self.wait_delete_vnf_job_finish(vnfjobid)
+ msg = "%s to delete VNF(%s)" % ("Succeed" if is_job_ok else "Failed", vnfinstid)
+ logger.debug(msg)
+ JobUtil.add_job_status(self.job_id, cur_progress, msg)
+ except Exception as e:
+ msg = "Exception occurs when delete VNF(%s)" % vnfinstid
+ logger.debug(msg)
+ JobUtil.add_job_status(self.job_id, cur_progress, msg)
def delete_vnf(self, nf_instid):
term_param = {
ret = call_from_ns_cancel_resource('vnf', nf_instid, term_param)
if ret[0] != 0:
logger.error("Terminate VNF(%s) failed: %s", nf_instid, ret[1])
- return False
+ return ''
job_info = json.JSONDecoder().decode(ret[1])
vnf_job_id = ignore_case_get(job_info, "jobId")
- return self.wait_delete_vnf_job_finish(vnf_job_id)
+ return vnf_job_id
def wait_delete_vnf_job_finish(self, vnf_job_id):
count = 0
continue
job_result = json.JSONDecoder().decode(ret[1])
if "responseDescriptor" not in job_result:
- logger.error("Job(%s) does not exist.", vnf_job_id)
+ logger.debug("No new progress after response_id(%s) in job(%s)", response_id, vnf_job_id)
continue
progress = job_result["responseDescriptor"]["progress"]
new_response_id = job_result["responseDescriptor"]["responseId"]
logger.debug("%s:%s:%s", progress, new_response_id, job_desc)
response_id = new_response_id
count = 0
- if progress == JOB_ERROR:
+ if progress == JOB_PROGRESS.ERROR:
job_timeout = False
logger.error("Job(%s) failed: %s", vnf_job_id, job_desc)
break
- elif progress == 100:
+ elif progress == JOB_PROGRESS.FINISHED:
job_end_normal, job_timeout = True, False
logger.info("Job(%s) ended normally", vnf_job_id)
break
try:
ret = call_from_ns_cancel_resource('pnf', pnfinst.pnfId)
if ret[0] == 0:
- delete_result = "success"
+ delete_result = "success"
except Exception as e:
logger.error("[cancel_pnf_list] error[%s]!" % e.message)
logger.error(traceback.format_exc())
Code Review / vfc / nfvo / lcm.git / blobdiff