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.sdc_run_catalog import query_vnfpackage_by_id
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)
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")
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
+ '''
+ 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))
'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
+ '''
+ nfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
+ content_args['VNFMID'] = 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)
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):
for resource_type in ['vdus', 'vls']:
"vimid": ignore_case_get(apply_result, "vimid"),
"tenant": ignore_case_get(apply_result, "tenant")}
+ '''
+ 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):
JobUtil.add_job_status(job_id, 25, 'Create vloumns!')
InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
self.assert_job_result(self.job_id, 255, "VNF nf_inst_id is not exist.")\r
\r
+ def test_instantiate_vnf_when_already_instantiated(self):\r
+ NfInstModel.objects.create(nfinstid='1111',\r
+ nf_name='vFW_01',\r
+ package_id='222',\r
+ version='',\r
+ vendor='',\r
+ netype='',\r
+ vnfd_model='',\r
+ status='INSTANTIATED',\r
+ nf_desc='vFW in Nanjing TIC Edge',\r
+ vnfdid='111',\r
+ create_time=now_time())\r
+ self.nf_inst_id = '1111'\r
+ self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
+ JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")\r
+ jobs = JobStatusModel.objects.filter(jobid=self.job_id,\r
+ progress=0,\r
+ descp="INST_VNF_READY")\r
+ self.assertEqual(1, len(jobs))\r
+ data = inst_req_data\r
+ InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
+ self.assert_job_result(self.job_id, 255, "VNF instantiationState is not NOT_INSTANTIATED.")\r
+\r
@mock.patch.object(restcall, 'call_req')\r
def test_instantiate_vnf_when_get_packageinfo_by_csarid_failed(self, mock_call_req):\r
NfInstModel.objects.create(nfinstid='1111',\r