from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, \
SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel
from lcm.pub.exceptions import NFLCMException
-from lcm.pub.msapi.gvnfmdriver import apply_grant_to_nfvo, notify_lcm_to_nfvo
+from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo
from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id
from lcm.pub.utils.jobutil import JobUtil
from lcm.pub.utils.timeutil import now_time
from lcm.pub.utils.values import ignore_case_get, get_none, get_boolean, get_integer
from lcm.pub.vimapi import adaptor
+from lcm.nf.biz.grant_vnf import grant_resource
logger = logging.getLogger(__name__)
self.nf_inst_id = nf_inst_id
self.job_id = job_id
self.vim_id = ignore_case_get(ignore_case_get(self.data, "additionalParams"), "vimId")
+ self.grant_type = "Instantiate"
def run(self):
try:
logger.info("Nf instancing pre-check finish")
def apply_grant(self):
- logger.info('Send resource grand request to nfvo')
- content_args = {
- 'vnfInstanceId': self.nf_inst_id,
- 'vnfDescriptorId': '',
- 'lifecycleOperation': 'Instantiate',
- 'jobId': self.job_id,
- 'addResource': [],
- 'removeResource': [],
- 'placementConstraint': [],
- 'additionalParam': {}
- }
-
vdus = ignore_case_get(self.vnfd_info, "vdus")
- res_index = 1
- for vdu in vdus:
- res_def = {
- 'type': 'VDU',
- 'resDefId': str(res_index),
- 'resDesId': ignore_case_get(vdu, "vdu_id")
- }
- content_args['addResource'].append(res_def)
- res_index += 1
-
- logger.debug("VnfInst = %s", self.nf_inst_id)
- '''
- vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id)
- if len(vnfmInfo) == 0:
- raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id)
- '''
- nfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
- content_args['additionalParam']['vnfmid'] = nfInsts[0].vnfminstid
- content_args['additionalParam']['vimid'] = self.vim_id
- logger.info('Grant request data = %s', content_args)
-
- apply_result = apply_grant_to_nfvo(json.dumps(content_args))
+ apply_result = grant_resource(data=self.data, nf_inst_id=self.nf_inst_id, job_id=self.job_id,
+ grant_type=self.grant_type, vdus=vdus)
self.set_location(apply_result)
logger.info('VnfdInfo = %s' % self.vnfd_info)
def lcm_notify(self):
logger.info('Send notify request to nfvo')
- affected_vnfc = []
+ 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,
- 'resourceName': vm[0].vmname, 'resourceType': 'vm'}
- affected_vnfc.append(
- {'vnfcInstanceId': vnfc.vnfcinstanceid,
+ vm_resource = {'vimId': vm[0].vimConnectionId, 'resourceId': vm[0].resouceid,
+ 'resourceProviderId': vm[0].vmname, 'vimLevelResourceType': 'vm'}
+ # TODO: is resourceName mapped to resourceProviderId?
+ affected_vnfcs.append(
+ {'id': vnfc.vnfcinstanceid,
'vduId': vnfc.vduid,
- 'changeType': 'added',
+ 'changeType': 'ADDED',
'computeResource': vm_resource})
- affected_vl = []
+ affected_vls = []
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': 'added',
+ network_resource = {'vimConnectionId': network.vimid, 'resourceId': network.resouceid,
+ 'resourceProviderId': network.name, 'vimLevelResourceType': 'network'}
+ # TODO: is resourceName mapped to resourceProviderId?
+ affected_vls.append(
+ {'id': network.networkid,
+ 'virtualLinkDescId': network.nodeId,
+ 'changeType': 'ADDED',
'networkResource': network_resource})
- affected_cp = []
+ ext_link_ports = []
ports = PortInstModel.objects.filter(instid=self.nf_inst_id)
for port in ports:
- affected_cp.append(
- {'vsInstanceId': port.portid,
- 'cpdid': port.nodeId,
- 'changeType': 'added',
- 'portResource': {'vimId': port.vimid, 'resourceId': port.resouceid,
- 'resourceName': port.name, 'resourceType': 'port'}})
- affected_vs = []
+ ext_link_ports.append({
+ 'id': port.portid, # TODO: port.portid or port.nodeid?
+ 'resourceHandle': {
+ 'vimConnectionId': port.vimid,
+ 'resourceId': port.resouceid,
+ 'resourceProviderId': port.name,
+ 'vimLevelResourceType': 'port'
+ },
+ # TODO: is resourceName mapped to resourceProviderId?
+ 'cpInstanceId': port.cpinstanceid
+ }),
+ affected_vss = []
vss = StorageInstModel.objects.filter(instid=self.nf_inst_id)
for vs in vss:
- affected_vs.append(
- {'vsInstanceId': vs.storageid,
- 'vsdId': vs.nodeId,
- 'changeType': 'added',
- 'storageResource': {'vimId': vs.vimid, 'resourceId': vs.resouceid,
- 'resourceName': vs.name, 'resourceType': 'volume'}})
+ affected_vss.append({
+ 'id': vs.storageid,
+ 'virtualStorageDescId': vs.nodeId,
+ 'changeType': 'ADDED',
+ 'storageResource': {
+ 'vimConnectionId': vs.vimid,
+ 'resourceId': vs.resouceid,
+ 'resourceProviderId': vs.name,
+ 'vimLevelResourceType': 'volume'
+ }
+ })
+ # TODO: is resourceName mapped to resourceProviderId?
content_args = {
- "status": 'result',
+ "notificationType": 'VnfLcmOperationOccurrenceNotification',
+ "notificationStatus": 'Result',
"vnfInstanceId": self.nf_inst_id,
- "operation": 'instantiate',
- "jobId": self.job_id,
- 'affectedVnfc': affected_vnfc,
- 'affectedVirtualLink': affected_vl,
- 'affectedVirtualStorage': affected_vs,
- 'affectedCp': affected_cp
+ "operation": 'INSTANTIATE',
+ "vnfLcmOpOccId": self.job_id,
+ 'affectedVnfcs': affected_vnfcs,
+ 'affectedVirtualLinks': affected_vls,
+ 'affectedVirtualStorages': affected_vss,
+ 'chengedExtConnectivity': [{
+ 'id': None, # TODO
+ 'resourceHandle': None, # TODO
+ 'extLinkPorts': ext_link_ports
+ }]
}
'''
raise NFLCMException('nf_inst_id(%s) does not exist in NfvoRegInfoModel' % self.nf_inst_id)
'''
nfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
- content_args['VNFMID'] = nfInsts[0].vnfminstid
+ content_args['vnfmInstId'] = nfInsts[0].vnfminstid
logger.info('Notify request data = %s' % content_args)
resp = notify_lcm_to_nfvo(json.dumps(content_args))
logger.info('Lcm notify end, response %s' % resp)
Code Review / vfc / gvnfm / vnflcm.git / blobdiff