# See the License for the specific language governing permissions and
# limitations under the License.
-import json
+# 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, 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
+# from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo
from lcm.pub.utils.jobutil import JobUtil
from lcm.pub.utils.timeutil import now_time
+from lcm.pub.utils.notificationsutil import NotificationsUtil
from lcm.pub.utils.values import ignore_case_get
from lcm.pub.vimapi import adaptor
from lcm.nf.biz.grant_vnf import grant_resource
+from lcm.nf.const import CHANGE_TYPE, GRANT_TYPE, OPERATION_TYPE
logger = logging.getLogger(__name__)
self.terminationType = ignore_case_get(self.data, "terminationType")
self.gracefulTerminationTimeout = ignore_case_get(self.data, "gracefulTerminationTimeout")
self.inst_resource = {'volumn': [], 'network': [], 'subnet': [], 'port': [], 'flavor': [], 'vm': []}
- self.grant_type = "Terminate"
+ self.grant_type = GRANT_TYPE.TERMINATE
def run(self):
try:
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:
+ if not resource_inst.resourceid:
continue
self.inst_resource[RESOURCE_MAP.get(resource_type)].append(self.get_resource(resource_inst))
logger.info('Query resource end, resource=%s' % self.inst_resource)
return {
"vim_id": resource.vimid,
"tenant_id": resource.tenant,
- "res_id": resource.resouceid,
+ "res_id": resource.resourceid,
"is_predefined": resource.is_predefined
}
def query_notify_data(self):
- logger.info('Send notify request to nfvo')
- affected_vnfcs = []
- 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,
- 'resourceProviderId': vm[0].vmname,
- 'vimLevelResourceType': 'vm'
- }
- affected_vnfcs.append({
- 'id': vnfc.vnfcinstanceid,
- 'vduId': vnfc.vduid,
- 'changeType': 'REMOVED',
- 'computeResource': vm_resource
- })
- affected_vls = []
- networks = NetworkInstModel.objects.filter(instid=self.nf_inst_id)
- for network in networks:
- network_resource = {
- 'vimConnectionId': network.vimid,
- 'resourceId': network.resouceid,
- 'resourceProviderId': network.name,
- 'vimLevelResourceType': 'network'
- }
- affected_vls.append({
- 'id': network.networkid,
- 'virtualLinkDescId': network.nodeId,
- 'changeType': 'REMOVED',
- 'networkResource': network_resource
- })
- ext_link_ports = []
- ports = PortInstModel.objects.filter(instid=self.nf_inst_id)
- for port in ports:
- ext_link_ports.append({
- 'id': port.portid,
- 'resourceHandle': {
- 'vimConnectionId': port.vimid,
- 'resourceId': port.resouceid,
- 'resourceProviderId': port.name,
- 'vimLevelResourceType': 'port'
- },
- 'cpInstanceId': port.cpinstanceid
- })
- affected_vss = []
- vss = StorageInstModel.objects.filter(instid=self.nf_inst_id)
- for vs in vss:
- affected_vss.append({
- 'id': vs.storageid,
- 'virtualStorageDescId': vs.nodeId,
- 'changeType': 'REMOVED',
- 'storageResource': {
- 'vimConnectionId': vs.vimid,
- 'resourceId': vs.resouceid,
- 'resourceProviderId': vs.name,
- 'vimLevelResourceType': 'volume'
- }
- })
+ self.notify_data = prepare_notification_data(self.nf_inst_id, self.job_id, CHANGE_TYPE.REMOVED, OPERATION_TYPE.TERMINATE)
+ 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 = {
- "notificationType": 'VnfLcmOperationOccurrenceNotification',
- "notificationStatus": 'RESULT',
- "vnfInstanceId": self.nf_inst_id,
- "operation": 'TERMINATE',
- "vnfLcmOpOccId": self.job_id,
- 'affectedVnfcs': affected_vnfcs,
- 'affectedVirtualLinks': affected_vls,
- 'affectedVirtualStorages': affected_vss,
- 'chengedExtConnectivity': [{
- 'id': None, # TODO
- 'resourceHandle': None, # TODO
- 'extLinkPorts': ext_link_ports
- }]
- }
-
- vnfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
- self.notify_data['vnfmInstId'] = vnfInsts[0].vnfminstid
- logger.info('Notify request data=%s' % self.notify_data)
def delete_resource(self):
logger.info('Rollback resource begin')
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))
+ logger.debug('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()
+ resource_table.objects.filter(instid=self.nf_inst_id, resourceid=res_id).delete()
def lcm_notify(self):
NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(status='NOT_INSTANTIATED', lastuptime=now_time())
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)
+ # resp = notify_lcm_to_nfvo(json.dumps(self.notify_data))
+ # logger.info('Lcm notify end, response: %s' % resp)
+ NotificationsUtil().send_notification(self.notify_data)
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())
+ NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(lastuptime=now_time())
JobUtil.add_job_status(self.job_id, 255, error_msg)
Code Review / vfc / gvnfm / vnflcm.git / blobdiff