Add input validation in substitution_mapping class

[parser.git] / tosca2heat / tosca-parser / toscaparser / entity_template.py

diff --git a/tosca2heat/tosca-parser/toscaparser/entity_template.py b/tosca2heat/tosca-parser/toscaparser/entity_template.py
index f416c99..7488c33 100644 (file)
--- a/tosca2heat/tosca-parser/toscaparser/entity_template.py
+++ b/tosca2heat/tosca-parser/toscaparser/entity_template.py
@@ -81,15 +81,11 @@ class EntityTemplate(object):
     def type(self):
         if self.type_definition:
             return self.type_definition.type
-        else:
-            return None
 
     @property
     def parent_type(self):
         if self.type_definition:
             return self.type_definition.parent_type
-        else:
-            return None
 
     @property
     def requirements(self):
@@ -189,7 +185,10 @@ class EntityTemplate(object):
 
     def _validate_capabilities_properties(self, capabilities):
         for cap, props in capabilities.items():
-            capabilitydef = self.get_capability(cap).definition
+            capability = self.get_capability(cap)
+            if not capability:
+                continue
+            capabilitydef = capability.definition
             self._common_validate_properties(capabilitydef,
                                              props[self.PROPERTIES])