- self.nf_inst_id = str(uuid.uuid4())
- NfInstModel.objects.create(nfinstid=self.nf_inst_id, mnfinstid=self.nf_inst_id, nf_name=self.vnf_instance_mame,
- package_id='todo', vnfm_inst_id='todo', version=self.vnfd_version, vendor=self.vendor,
- producttype=self.producttype,netype=self.netype, vnfd_model=self.vnfd_model,
- instantiationState='NOT_INSTANTIATED', nf_desc=self.description, vnfdid=self.vnfd_id,
- vnfSoftwareVersion=self.vnfSoftwareVersion, vnfConfigurableProperties='todo',
- localizationLanguage='EN_US',create_time=now_time())
- is_exist = NfInstModel.objects.filter(nf_name=self.vnf_instance_mame).exists()
- logger.debug("check_ns_inst_name_exist::is_exist=%s" % is_exist)
- vnf_inst = NfInstModel.objects.get(nfinstid=self.nf_inst_id)
+ # get rawdata from catalog by csar_id
+ raw_data = query_rawdata_from_catalog(self.csar_id, self.data)
+ self.vnfd = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json
+ self.vnfd = json.JSONDecoder().decode(self.vnfd)
+
+ vnfd_info = raw_data
+ metadata = ignore_case_get(vnfd_info, "metadata")
+ version = ignore_case_get(metadata, "vnfd_version")
+ vendor = ignore_case_get(metadata, "vendor")
+ netype = ignore_case_get(metadata, "vnf_type")
+ vnfsoftwareversion = ignore_case_get(metadata, "version")
+ vnfd_model = vnfd_info
+
+ nf_inst_id = str(uuid.uuid4())
+ NfInstModel.objects.create(nfinstid=nf_inst_id, nf_name=self.vnf_instance_mame, package_id=self.package_id,
+ version=version, vendor=vendor, netype=netype, vnfd_model=vnfd_model,
+ status='NOT_INSTANTIATED', nf_desc=self.description, vnfdid=self.vnfd_id,
+ vnfSoftwareVersion=vnfsoftwareversion, create_time=now_time())
+ vnf_inst = NfInstModel.objects.get(nfinstid=nf_inst_id)