- #update NfInstModel
- NfInstModel.objects.filter(nfinstid=self.nf_inst_id).update(flavour_id=ignore_case_get(self.data, "flavourId"),
- vnf_level=ignore_case_get(self.data, 'instantiationLevelId'),
- input_params=ignore_case_get(self.data, 'additionalParams'),
- extension=ignore_case_get(self.data, ''),
- initallocatedata=self.vnfd_info,
- localizationLanguage=ignore_case_get(self.data, 'localizationLanguage'),
- lastuptime=now_time())
- JobUtil.add_job_status(self.job_id, 10, 'Nf instancing pre-check finish')
+ JobUtil.add_job_status(self.job_id, 10, 'Get rawdata from catalog by csar_id')
+ # get rawdata from catalog by csar_id
+ input_parameters = []
+ for key, val in self.data['additionalParams'].items():
+ input_parameters.append({"key": key, "value": val})
+ raw_data = query_rawdata_from_catalog(self.csar_id, input_parameters)
+ 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
+
+ self.checkParameterExist()
+ # update NfInstModel
+ NfInstModel.objects.filter(nfinstid=self.nf_inst_id).\
+ update(flavour_id=ignore_case_get(self.data, "flavourId"),
+ input_params=self.data,
+ vnfd_model=self.vnfd_info,
+ localizationLanguage=ignore_case_get(self.data, 'localizationLanguage'),
+ lastuptime=now_time())
+ JobUtil.add_job_status(self.job_id, 15, 'Nf instancing pre-check finish')