from threading import Thread
from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, \
- SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel, NfvoRegInfoModel
+ 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, prepare_notification_data
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
+from lcm.nf.const import GRANT_TYPE
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 = GRANT_TYPE.INSTANTIATE
def run(self):
try:
self.vnfd_id = vnf_insts[0].vnfdid
JobUtil.add_job_status(self.job_id, 10, 'Get vnf package info from catalog by csar_id')
input_parameters = []
- inputs = ignore_case_get(self.data['additionalParams'], "inputs")
+ inputs = ignore_case_get(self.data, "additionalParams")
if inputs:
if isinstance(inputs, (str, unicode)):
inputs = json.loads(inputs)
for key, val in inputs.items():
input_parameters.append({"key": key, "value": val})
- vnf_package_info = query_vnfpackage_by_id(self.vnfd_id)
- self.vnfd_info = json.loads(ignore_case_get(ignore_case_get(vnf_package_info, "packageInfo"), "vnfdModel"))
+ vnf_package = query_vnfpackage_by_id(self.vnfd_id)
+ pkg_info = ignore_case_get(vnf_package, "packageInfo")
+ self.vnfd_info = json.loads(ignore_case_get(pkg_info, "vnfdModel"))
self.update_cps()
metadata = ignore_case_get(self.vnfd_info, "metadata")
status='NOT_INSTANTIATED',
vnfdid=self.vnfd_id,
localizationLanguage=ignore_case_get(self.data, 'localizationLanguage'),
- input_params=self.data,
+ input_params=input_parameters,
vnfSoftwareVersion=vnfsoftwareversion,
lastuptime=now_time())
logger.info("VimId = %s" % self.vim_id)
+ '''
is_exist = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id).exists()
if not is_exist:
NfvoRegInfoModel.objects.create(
nfvoid=self.nf_inst_id,
- # vnfminstid=ignore_case_get(self.data, "vnfmId"),
+ vnfminstid=ignore_case_get(self.data, "vnfmId"),
apiurl=self.vim_id)
+ '''
JobUtil.add_job_status(self.job_id, 15, 'Nf instancing pre-check finish')
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)
- content_args['additionalParam']['vnfmid'] = vnfmInfo[0].vnfminstid
- content_args['additionalParam']['vimid'] = vnfmInfo[0].apiurl
- 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)
logger.info("Create resource finish")
def lcm_notify(self):
- logger.info('Send notify request to nfvo')
- affected_vnfc = []
- 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,
- 'vduId': vnfc.vduid,
- 'changeType': 'added',
- 'computeResource': vm_resource})
- affected_vl = []
- 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',
- 'networkResource': network_resource})
- affected_cp = []
- 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 = []
- 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'}})
- content_args = {
- "status": 'result',
- "vnfInstanceId": self.nf_inst_id,
- "operation": 'instantiate',
- "jobId": self.job_id,
- 'affectedVnfc': affected_vnfc,
- 'affectedVirtualLink': affected_vl,
- 'affectedVirtualStorage': affected_vs,
- 'affectedCp': affected_cp
- }
-
- 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)
- content_args['VNFMID'] = vnfmInfo[0].vnfminstid
- logger.info('Notify request data = %s' % content_args)
- resp = notify_lcm_to_nfvo(json.dumps(content_args))
+ notification_content = prepare_notification_data(self.nf_inst_id, self.job_id, "ADDED")
+ logger.info('Notify request data = %s' % notification_content)
+ resp = notify_lcm_to_nfvo(json.dumps(notification_content))
logger.info('Lcm notify end, response %s' % resp)
def vnf_inst_failed_handle(self, error_msg):
def update_cps(self):
for extlink in ignore_case_get(self.data, "extVirtualLinks"):
- for cp in ignore_case_get(self.vnfd_info, "cps"):
- cpdid = ignore_case_get(extlink, "cpdId")
- if cpdid == ignore_case_get(cp, "cp_id"):
- cp["networkId"] = ignore_case_get(extlink, "resourceId")
- cp["subnetId"] = ignore_case_get(extlink, "resourceSubnetId")
- break
+ for ext_cp in ignore_case_get(extlink, "extCps"):
+ cpdid = ignore_case_get(ext_cp, "cpdId")
+ for cp in ignore_case_get(self.vnfd_info, "cps"):
+ if cpdid == ignore_case_get(cp, "cp_id"):
+ cp["networkId"] = ignore_case_get(extlink, "resourceId")
+ cp["subnetId"] = ignore_case_get(extlink, "resourceSubnetId")
+ break
def set_location(self, apply_result):
+ vim_connections = ignore_case_get(apply_result, "vimConnections")
+ vnfid = ignore_case_get(apply_result, "vnfInstanceId")
+ directive = ignore_case_get(apply_result, "directive")
+ vim_assets = ignore_case_get(apply_result, "vimAssets")
+ access_info = ignore_case_get(vim_connections[0], "accessInfo")
+ tenant = ignore_case_get(access_info, "tenant")
+ vimid = ignore_case_get(vim_connections[0], "vimId")
+ cloud_owner, cloud_regionid = vimid.split("_")
+ vdu_info = []
+
+ for flavor in ignore_case_get(vim_assets, "vimComputeResourceFlavour"):
+ vdu_info.append({"vduName": flavor["resourceProviderId"],
+ "flavorName": flavor["vimFlavourId"],
+ "directive": directive})
+
for resource_type in ['vdus', 'vls']:
for resource in ignore_case_get(self.vnfd_info, resource_type):
if "location_info" in resource["properties"]:
- resource["properties"]["location_info"]["vimid"] = ignore_case_get(apply_result, "vimid")
- resource["properties"]["location_info"]["tenant"] = ignore_case_get(apply_result, "tenant")
+ resource["properties"]["location_info"]["vimid"] = vimid
+ resource["properties"]["location_info"]["tenant"] = tenant
+ resource["properties"]["location_info"]["vnfId"] = vnfid
+ resource["properties"]["location_info"]["cloudOwner"] = cloud_owner
+ resource["properties"]["location_info"]["cloudRegionId"] = cloud_regionid
+ resource["properties"]["location_info"]["vduInfo"] = vdu_info
else:
resource["properties"]["location_info"] = {
- "vimid": ignore_case_get(apply_result, "vimid"),
- "tenant": ignore_case_get(apply_result, "tenant")}
+ "vimid": vimid,
+ "tenant": tenant,
+ "vnfId": vnfid,
+ "cloudOwner": cloud_owner,
+ "cloudRegionId": cloud_regionid,
+ "vduInfo": vdu_info}
+
+ '''
+ def get_subnet_ids(self, ext_cp):
+ subnet_ids = []
+ for cp_conf in ignore_case_get(ext_cp, "cpConfig"):
+ for cp_protocol in ignore_case_get(ext_cp, "cpProtocolData"):
+ ip_over_ethernet = ignore_case_get(cp_protocol, "ipOverEthernet")
+ for ip_address in ignore_case_get(ip_over_ethernet, "ipAddresses"):
+ subnet_ids.append(ignore_case_get(ip_address, "subnetId"))
+ return subnet_ids
+ '''
def volume_save(job_id, nf_inst_id, ret):
StorageInstModel.objects.create(
storageid=str(uuid.uuid4()),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
name=ignore_case_get(ret, "name"),
tenant=ignore_case_get(ret, "tenantId"),
create_time=ignore_case_get(ret, "createTime"),
networkid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
tenant=ignore_case_get(ret, "tenantId"),
segmentid=str(ignore_case_get(ret, "segmentationId")),
network_type=ignore_case_get(ret, "networkType"),
subnetworkid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
tenant=ignore_case_get(ret, "tenantId"),
networkid=ignore_case_get(ret, "networkId"),
cidr=ignore_case_get(ret, "cidr"),
subnetworkid=ignore_case_get(ret, "subnetId"),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
tenant=ignore_case_get(ret, "tenantId"),
macaddress=ignore_case_get(ret, "macAddress"),
ipaddress=ignore_case_get(ret, "ip"),
flavourid=str(uuid.uuid4()),
name=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
tenant=ignore_case_get(ret, "tenantId"),
vcpu=get_integer(ignore_case_get(ret, "vcpu")),
memory=get_integer(ignore_case_get(ret, "memory")),
vmid=vm_id,
vmname=ignore_case_get(ret, "name"),
vimid=ignore_case_get(ret, "vimId"),
- resouceid=ignore_case_get(ret, "id"),
+ resourceid=ignore_case_get(ret, "id"),
tenant=ignore_case_get(ret, "tenantId"),
nic_array=ignore_case_get(ret, "nicArray"),
metadata=ignore_case_get(ret, "metadata"),