- JobUtil.add_job_status(self.job_id, 30, 'nf_cancel_task grant_resource')
- reg_info = NfvoRegInfoModel.objects.filter(vnfminstid=self.vnfm_inst_id).first()
- nf_info = NfInstModel.objects.filter(nfinstid=self.vnf_inst_id).first()
- content_args = {'nfvoInstanceId': reg_info.nfvoid, 'vnfmInstanceId': self.vnfm_inst_id,
- 'nfInstanceId': self.vnf_inst_id, 'nfDescriptorId': nf_info.vnf_id,
- 'lifecycleOperation': 'Terminal', 'jobId': '', 'addResource': [],
- 'removeResource': [], 'placementConstraint': [], 'exVimIdList': [], 'additionalParam': {}}
-
- content_args['removeResource'] = self.get_grant_data()
+ content_args = {'vnfInstanceId': self.nf_inst_id, 'vnfDescriptorId': '',
+ 'lifecycleOperation': 'Instantiate', 'jobId': self.job_id,
+ 'addResource': [], 'removeResource': [],
+ 'placementConstraint': [], 'additionalParam': {}}
+
+ vdus = VmInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1)
+ res_index = 1
+ for vdu in vdus:
+ res_def = {'type': 'VDU',
+ 'resDefId': str(res_index),
+ 'resDesId': vdu.resouceid}
+ content_args['removeResource'].append(res_def)
+ res_index += 1