X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=genericparser%2Fpub%2Futils%2Ftoscaparsers%2Fvnfdparser%2Fvnfd_sol_251.py;h=6ad26e8a35411d796a2a0d14ece58c340a8a5f70;hb=e7310fb508784f72f54fbad5762cec67b134241b;hp=d2f1229bc79b44aeeacfd5772fa78e0a8c4c4589;hpb=0cd4e54ded5de005d5480d5b0d85535c1462b8eb;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py b/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py
index d2f1229..6ad26e8 100644
--- a/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py
+++ b/genericparser/pub/utils/toscaparsers/vnfdparser/vnfd_sol_251.py
@@ -32,31 +32,52 @@ class VnfdSOL251():
         vnf = self.model.get_substitution_mappings(tosca)
         properties = vnf.get("properties", {})
         metadata = vnf.get("metadata", {})
-        if properties.get("descriptor_id", "") == "":
-            descriptor_id = metadata.get("descriptor_id", "")
-            if descriptor_id == "":
-                descriptor_id = metadata.get("id", "")
-            if descriptor_id == "":
-                descriptor_id = metadata.get("UUID", "")
-            properties["descriptor_id"] = descriptor_id
-
-        if properties.get("descriptor_version", "") == "":
-            version = metadata.get("template_version", "")
-            if version == "":
-                version = metadata.get("version", "")
-            properties["descriptor_version"] = version
-
-        if properties.get("provider", "") == "":
-            provider = metadata.get("template_author", "")
-            if provider == "":
-                provider = metadata.get("provider", "")
-            properties["provider"] = provider
-
-        if properties.get("template_name", "") == "":
-            template_name = metadata.get("template_name", "")
-            if template_name == "":
-                template_name = metadata.get("template_name", "")
-            properties["template_name"] = template_name
+
+        for key, value in properties.items():
+            if isinstance(value, dict):
+                if value["type"] == "string":
+                    properties[key] = value.get("default", "")
+                elif value["type"] == "list":
+                    properties[key] = value.get("default", {})
+                else:
+                    properties[key] = value.get("default", "")
+        ptype = "descriptor_id"
+        meta_types = ["descriptor_id", "id", "UUID"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        ptype = "descriptor_version"
+        meta_types = ["template_version", "version"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        ptype = "provider"
+        meta_types = ["template_author", "provider"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        ptype = "template_name"
+        meta_types = ["template_name"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        ptype = "software_version"
+        meta_types = ["software_version"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        ptype = "product_name"
+        meta_types = ["product_name"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        ptype = "flavour_description"
+        meta_types = ["flavour_description"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        ptype = "vnfm_info"
+        meta_types = ["vnfm_info"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        ptype = "flavour_id"
+        meta_types = ["flavour_id"]
+        self._get_property(properties, metadata, ptype, meta_types)
+
+        logger.debug("vnf:%s", vnf)
 
         return vnf
 
@@ -148,6 +169,13 @@ class VnfdSOL251():
             return {"external_cps": external_cps, "forward_cps": forward_cps}
         return {}
 
+    def _get_property(self, properties, metadata, ptype, meta_types):
+        if ptype not in properties or properties[ptype] == "":
+            for mtype in meta_types:
+                data = metadata.get(mtype, "")
+                if data != "":
+                    properties[ptype] = data
+
     def _trans_virtual_storage(self, virtual_storage):
         if isinstance(virtual_storage, str):
             return {"virtual_storage_id": virtual_storage}