Merge "Fix fieldName"

5 files changed, 8 insertions, 8 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"
         },
diff --git a/catalog/pub/utils/toscaparser/vnfdparser/vnfd_sol_251.py b/catalog/pub/utils/toscaparser/vnfdparser/vnfd_sol_251.py
index ed347aff..1785f349 100644
--- a/catalog/pub/utils/toscaparser/vnfdparser/vnfd_sol_251.py
+++ b/catalog/pub/utils/toscaparser/vnfdparser/vnfd_sol_251.py
@@ -39,11 +39,11 @@ class VnfdSOL251():
                 descriptor_id = metadata.get("UUID", "")
             properties["descriptor_id"] = descriptor_id
 
-        if properties.get("descriptor_verison", "") == "":
+        if properties.get("descriptor_version", "") == "":
             version = metadata.get("template_version", "")
             if version == "":
                 version = metadata.get("version", "")
-            properties["descriptor_verison"] = version
+            properties["descriptor_version"] = version
 
         if properties.get("provider", "") == "":
             provider = metadata.get("template_author", "")
diff --git a/catalog/pub/utils/toscaparser/vnfdparser/vnfd_sol_base.py b/catalog/pub/utils/toscaparser/vnfdparser/vnfd_sol_base.py
index d14b380e..89ddc84a 100644
--- a/catalog/pub/utils/toscaparser/vnfdparser/vnfd_sol_base.py
+++ b/catalog/pub/utils/toscaparser/vnfdparser/vnfd_sol_base.py
@@ -40,11 +40,11 @@ class VnfdSOLBase():
                 descriptor_id = metadata.get("UUID", "")
             properties["descriptor_id"] = descriptor_id
 
-        if properties.get("descriptor_verison", "") == "":
+        if properties.get("descriptor_version", "") == "":
             version = metadata.get("template_version", "")
             if version == "":
                 version = metadata.get("version", "")
-            properties["descriptor_verison"] = version
+            properties["descriptor_version"] = version
 
         if properties.get("provider", "") == "":
             provider = metadata.get("template_author", "")