Change-Id: Ib020200d9289c821e41948921fbd624145162f70
Issue-Id: GVNFM-42
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
self.package_info = get_packageinfo_by_vnfdid(self.vnfd_id)
for val in self.package_info:
if self.vnfd_id == ignore_case_get(val, "vnfd_id"):
self.package_info = get_packageinfo_by_vnfdid(self.vnfd_id)
for val in self.package_info:
if self.vnfd_id == ignore_case_get(val, "vnfd_id"):
- self.package_id = ignore_case_get(val, "package_id")
- self.csar_id = ignore_case_get(val, "csar_id")
+ self.package_id = ignore_case_get(val, "csar_id")
- # self.package_info = get_packageinfo_by_vnfdid(self.vnfd_id)
- # self.package_id = ignore_case_get(self.package_info, "package_id")
- # self.csar_id = ignore_case_get(self.package_info, "csar_id")
# get rawdata from catalog by csar_id
# get rawdata from catalog by csar_id
- raw_data = query_rawdata_from_catalog(self.csar_id, self.data)
+ raw_data = query_rawdata_from_catalog(self.package_id, self.data)
self.vnfd = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json
self.vnfd = json.JSONDecoder().decode(self.vnfd)
self.vnfd = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json
self.vnfd = json.JSONDecoder().decode(self.vnfd)
self.package_info = get_packageinfo_by_vnfdid(self.vnfd_id)
for val in self.package_info:
if self.vnfd_id == ignore_case_get(val, "vnfd_id"):
self.package_info = get_packageinfo_by_vnfdid(self.vnfd_id)
for val in self.package_info:
if self.vnfd_id == ignore_case_get(val, "vnfd_id"):
- self.package_id = ignore_case_get(val, "package_id")
- self.csar_id = ignore_case_get(val, "csar_id")
+ self.package_id = ignore_case_get(val, "csar_id")
break
JobUtil.add_job_status(self.job_id, 10, 'Get rawdata from catalog by csar_id')
break
JobUtil.add_job_status(self.job_id, 10, 'Get rawdata from catalog by csar_id')
input_parameters = []
for key, val in self.data['additionalParams'].items():
input_parameters.append({"key": key, "value": val})
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)
+ raw_data = query_rawdata_from_catalog(self.package_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 = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json
self.vnfd_info = json.JSONDecoder().decode(self.vnfd_info)