diff options
Diffstat (limited to 'catalog/packages')
| -rw-r--r-- | catalog/packages/biz/sdc_vnf_package.py | 4 | ||||
| -rw-r--r-- | catalog/packages/biz/vnf_package.py | 2 | ||||
| -rw-r--r-- | catalog/packages/tests/const.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/catalog/packages/biz/sdc_vnf_package.py b/catalog/packages/biz/sdc_vnf_package.py index d1ee4c7d..e432f0e4 100644 --- a/catalog/packages/biz/sdc_vnf_package.py +++ b/catalog/packages/biz/sdc_vnf_package.py @@ -130,14 +130,14 @@ class NfDistributeThread(threading.Thread): vnfd = json.JSONDecoder().decode(vnfd_json) if not vnfd.get("vnf"): - raise CatalogException("VNF propeties and metadata in VNF Package(id=%s) are empty." % self.csar_id) + raise CatalogException("VNF properties and metadata in VNF Package(id=%s) are empty." % self.csar_id) vnfd_id = vnfd["vnf"]["properties"].get("descriptor_id", "") if VnfPackageModel.objects.filter(vnfdId=vnfd_id): logger.error("VNF package(%s) already exists.", vnfd_id) raise CatalogException("VNF package(%s) already exists." % vnfd_id) JobUtil.add_job_status(self.job_id, 30, "Save CSAR(%s) to database." % self.csar_id) - vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_verison", "") + vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_version", "") vnf_provider = vnfd["vnf"]["properties"].get("provider", "") vnf_software_version = vnfd["vnf"]["properties"].get("software_version", "") vnfd_product_name = vnfd["vnf"]["properties"].get("product_name", "") diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py index a387378d..34130f1d 100644 --- a/catalog/packages/biz/vnf_package.py +++ b/catalog/packages/biz/vnf_package.py @@ -201,7 +201,7 @@ def parse_vnfd_and_save(vnf_pkg_id, vnf_pkg_path): logger.error("VNF package(%s,%s) already exists.", other_pkg[0].vnfPackageId, vnfd_id) raise CatalogException("VNF package(%s) already exists." % vnfd_id) vnf_provider = vnfd["vnf"]["properties"].get("provider", "") - vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_verison", "") + vnfd_ver = vnfd["vnf"]["properties"].get("descriptor_version", "") vnf_software_version = vnfd["vnf"]["properties"].get("software_version", "") vnfd_product_name = vnfd["vnf"]["properties"].get("product_name", "") vnf_pkg.update( diff --git a/catalog/packages/tests/const.py b/catalog/packages/tests/const.py index a98ccb69..991c87c5 100644 --- a/catalog/packages/tests/const.py +++ b/catalog/packages/tests/const.py @@ -218,7 +218,7 @@ vnfd_data = { "vnf": { "properties": { "descriptor_id": "zte-hss-1.0", - "descriptor_verison": "1.0.0", + "descriptor_version": "1.0.0", "software_version": "1.0.0", "provider": "zte" }, |