import traceback
from threading import Thread
-from lcm.nf.const import VNF_STATUS
+from lcm.nf.const import VNF_STATUS, RESOURCE_MAP
from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \
- FlavourInstModel, PortInstModel, SubNetworkInstModel, VNFCInstModel, NfvoRegInfoModel
+ PortInstModel, VNFCInstModel, NfvoRegInfoModel, 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
self.job_id = job_id
self.terminationType = ignore_case_get(self.data, "terminationType")
self.gracefulTerminationTimeout = ignore_case_get(self.data, "gracefulTerminationTimeout")
- self.apply_result = None
- self.notify_data = None
self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], 'flavor': [], 'vm': []}
def run(self):
if not vnf_insts.exists():
logger.warn('VnfInst(%s) does not exist' % self.nf_inst_id)
return False
- # raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id)
- # sel_vnf = vnf_insts[0]
- # if sel_vnf.status != 'VNF_INSTANTIATED':
- # raise NFLCMException("Don't allow to terminate vnf(status:[%s])" % sel_vnf.status)
if self.terminationType == 'GRACEFUL' and not self.gracefulTerminationTimeout:
logger.warn("Set Graceful default termination timeout = 60")
self.gracefulTerminationTimeout = 60
- # raise NFLCMException("Graceful termination must set timeout")
-
NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status=VNF_STATUS.TERMINATING)
JobUtil.add_job_status(self.job_id, 10, 'Nf terminating pre-check finish')
logger.info("Nf terminating pre-check finish")
return True
def grant_resource(self):
- logger.info("nf_cancel_task grant_resource begin")
+ logger.info("Grant resource begin")
content_args = {
'vnfInstanceId': self.nf_inst_id,
'vnfDescriptorId': '',
vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id)
if len(vnfmInfo) == 0:
- raise NFLCMException('nf_inst_id(%s) does not exist in NfvoRegInfoModel' % self.nf_inst_id)
+ 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
- logger.info('content_args=%s' % content_args)
+ logger.info('Grant request data=%s' % content_args)
self.apply_result = apply_grant_to_nfvo(json.dumps(content_args))
- logger.info("nf_cancel_task grant_resource end")
+ logger.info("Grant resource end, response: %s" % self.apply_result)
JobUtil.add_job_status(self.job_id, 20, 'Nf terminating grant_resource finish')
def query_inst_resource(self):
- logger.info('[query_resource begin]:inst_id=%s' % self.nf_inst_id)
- resoure_map = {
- 'Storage': 'volumn',
- 'Network': 'network',
- 'SubNetwork': 'subnet',
- 'Port': 'port',
- 'Flavour': 'flavor',
- 'Vm': 'vm'
- }
- for resoure_type in resoure_map.keys():
- resoure_table = globals().get(resoure_type + 'InstModel')
- resoure_insts = resoure_table.objects.filter(instid=self.nf_inst_id)
- for resoure_inst in resoure_insts:
- if not resoure_inst.resouceid:
+ logger.info('Query resource begin')
+ for resource_type in RESOURCE_MAP.keys():
+ resource_table = globals().get(resource_type + 'InstModel')
+ resource_insts = resource_table.objects.filter(instid=self.nf_inst_id)
+ for resource_inst in resource_insts:
+ if not resource_inst.resouceid:
continue
- self.inst_resource[resoure_map.get(resoure_type)].append(self.get_resource(resoure_inst))
- logger.info('[query_resource]:ret_resource=%s' % self.inst_resource)
+ self.inst_resource[RESOURCE_MAP.get(resource_type)].append(self.get_resource(resource_inst))
+ logger.info('Query resource end, resource=%s' % self.inst_resource)
def get_resource(self, resource):
return {
}
def query_notify_data(self):
- logger.info('[NF terminate] send notify request to nfvo start')
+ logger.info('Send notify request to nfvo')
affected_vnfc = []
vnfcs = VNFCInstModel.objects.filter(instid=self.nf_inst_id)
for vnfc in vnfcs:
'changeType': 'removed',
'storageResource': {'vimId': vs.vimid, 'resourceId': vs.resouceid,
'resourceName': vs.name, 'resourceType': 'volume'}})
+ 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,
vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id)
if len(vnfmInfo) == 0:
- raise NFLCMException('nf_inst_id(%s) does not exist in NfvoRegInfoModel' % self.nf_inst_id)
+ raise NFLCMException('VnfId(%s) does not exist' % self.nf_inst_id)
self.notify_data['VNFMID'] = vnfmInfo[0].vnfminstid
- logger.info('content_args=%s' % self.notify_data)
+ logger.info('Notify request data=%s' % self.notify_data)
def delete_resource(self):
- logger.info('rollback resource begin')
+ logger.info('Rollback resource begin')
adaptor.delete_vim_res(self.inst_resource, self.do_notify_delete)
- logger.info('rollback resource complete')
+ logger.info('Rollback resource complete')
def do_notify_delete(self, res_type, res_id):
- logger.error('Deleting [%s] resource:resourceid [%s]' % (res_type, res_id))
- if res_type == adaptor.RES_VM:
- VmInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete()
- elif res_type == adaptor.RES_FLAVOR:
- FlavourInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete()
- elif res_type == adaptor.RES_PORT:
- PortInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete()
- elif res_type == adaptor.RES_SUBNET:
- SubNetworkInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete()
- elif res_type == adaptor.RES_NETWORK:
- NetworkInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete()
- elif res_type == adaptor.RES_VOLUME:
- StorageInstModel.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete()
+ logger.error('Deleting [%s] resource, resourceid [%s]' % (res_type, res_id))
+ resource_type = RESOURCE_MAP.keys()[RESOURCE_MAP.values().index(res_type)]
+ resource_table = globals().get(resource_type + 'InstModel')
+ resource_table.objects.filter(instid=self.nf_inst_id, resouceid=res_id).delete()
def lcm_notify(self):
NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='NOT_INSTANTIATED', lastuptime=now_time())
- logger.info('[NF termination] send notify request to nfvo end')
+ logger.info('Send notify request to nfvo')
resp = notify_lcm_to_nfvo(json.dumps(self.notify_data))
- logger.info('[NF termination] get lcm response %s' % resp)
- logger.info('[NF termination] send notify request to nfvo end')
+ 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)
Code Review / vfc / gvnfm / vnflcm.git / blobdiff