import uuid
from threading import Thread
-from lcm.nf.vnfs.const import vnfd_model_dict
from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, \
SubNetworkInstModel, PortInstModel, StorageInstModel, FlavourInstModel, VNFCInstModel, NfvoRegInfoModel
from lcm.pub.exceptions import NFLCMException
self.vnfd_info = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json
self.vnfd_info = json.JSONDecoder().decode(self.vnfd_info)
- #self.vnfd_info = vnfd_model_dict # just for test
+ # self.vnfd_info = vnfd_model_dict # just for test
self.update_cps()
self.check_parameter_exist()
vnfsoftwareversion = ignore_case_get(metadata, "version")
vnfd_model = self.vnfd_info
NfInstModel.objects.filter(nfinstid=self.nf_inst_id).\
- update(package_id=self.package_id, flavour_id=ignore_case_get(self.data, "flavourId"), version=version,
- vendor=vendor, netype=netype, vnfd_model=vnfd_model, status='NOT_INSTANTIATED', vnfdid=self.vnfd_id,
- localizationLanguage=ignore_case_get(self.data, 'localizationLanguage'), input_params=self.data,
- vnfSoftwareVersion=vnfsoftwareversion, lastuptime=now_time())
+ update(package_id=self.package_id,
+ flavour_id=ignore_case_get(self.data, "flavourId"),
+ version=version,
+ vendor=vendor,
+ netype=netype,
+ vnfd_model=vnfd_model,
+ status='NOT_INSTANTIATED',
+ vnfdid=self.vnfd_id,
+ localizationLanguage=ignore_case_get(self.data, 'localizationLanguage'),
+ input_params=self.data,
+ vnfSoftwareVersion=vnfsoftwareversion,
+ lastuptime=now_time())
logger.info("self.vim_id = %s" % self.vim_id)
- NfvoRegInfoModel.objects.create(nfvoid=self.nf_inst_id,
- vnfminstid=ignore_case_get(self.data, "vnfmId"), apiurl=self.vim_id)
+ NfvoRegInfoModel.objects.create(
+ nfvoid=self.nf_inst_id,
+ 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")
content_args['additionalParam']['vimid'] = vnfmInfo[0].apiurl
logger.info('content_args=%s' % content_args)
apply_result = apply_grant_to_nfvo(json.dumps(content_args))
- #vim_info = ignore_case_get(apply_result, "vim")
- #vim_info = ignore_case_get(json.JSONDecoder().decode(apply_result), "vim")
+ # vim_info = ignore_case_get(apply_result, "vim")
+ # vim_info = ignore_case_get(json.JSONDecoder().decode(apply_result), "vim")
for vdu in ignore_case_get(self.vnfd_info, "vdus"):
if "location_info" in vdu["properties"]:
{'vsInstanceId': port.portid,
'cpdid': port.nodeId,
'changeType': 'added',
- 'storageResource': {'vimId': port.vimid, 'resourceId': port.resouceid,
- 'resourceName': port.name, 'resourceType': 'port'}})
+ '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:
'affectedVnfc': affected_vnfc,
'affectedVirtualLink': affected_vl,
'affectedVirtualStorage': affected_vs,
- 'affectedCp': affected_cp
- }
+ '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)