fix sol003 grant parameter, etc
Change-Id: Ib33f13b52a0261aeaa4969856e7cc0056c3a3872
Issue-ID: VFC-1158
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
"cpdId": self.get_cpd_id_of_vl(network_info['key_name']),
"vim": {
"vimid": vl_instance.vimid
"cpdId": self.get_cpd_id_of_vl(network_info['key_name']),
"vim": {
"vimid": vl_instance.vimid
+ },
+ # SOL 003 align
+ "id": vl_instance_id,
+ "vimConnectionId": vl_instance.vimid,
+ "extCps": [{"cpdId": self.get_cpd_id_of_vl(network_info['key_name']), "cpConfig":[]}]
})
return virtual_link_list, ext_virtual_link
})
return virtual_link_list, ext_virtual_link
'vnfInstanceName': self.vnf_inst_name,
'vnfPackageId': ignore_case_get(self.nf_package_info, "vnfPackageId"),
'vnfDescriptorId': self.vnfd_id,
'vnfInstanceName': self.vnf_inst_name,
'vnfPackageId': ignore_case_get(self.nf_package_info, "vnfPackageId"),
'vnfDescriptorId': self.vnfd_id,
+ 'flavourId': "default",
'extVirtualLink': ext_virtual_link,
'additionalParam': {
"properties": self.properties,
'extVirtualLink': ext_virtual_link,
'additionalParam': {
"properties": self.properties,
additional_param = ignore_case_get(self.data, "additionalparams")
vnfm_inst_id = ignore_case_get(additional_param, "vnfmid")
vim_id = ignore_case_get(additional_param, "vimid")
additional_param = ignore_case_get(self.data, "additionalparams")
vnfm_inst_id = ignore_case_get(additional_param, "vnfmid")
vim_id = ignore_case_get(additional_param, "vimid")
-
- vnfinsts = NfInstModel.objects.filter(
- nfinstid=m_vnf_inst_id, vnfm_inst_id=vnfm_inst_id)
+ if vnfm_inst_id and vnfm_inst_id != "":
+ vnfinsts = NfInstModel.objects.filter(
+ mnfinstid=m_vnf_inst_id, vnfm_inst_id=vnfm_inst_id)
+ else:
+ vnfinsts = NfInstModel.objects.filter(
+ mnfinstid=m_vnf_inst_id)
if not vnfinsts:
raise NSLCMException("Vnfinst(%s) is not found in vnfm(%s)" % (
m_vnf_inst_id, vnfm_inst_id))
if not vnfinsts:
raise NSLCMException("Vnfinst(%s) is not found in vnfm(%s)" % (
m_vnf_inst_id, vnfm_inst_id))