From 0997552722dc4845a854e0e6f8d7f18058e26380 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Fri, 8 Jul 2016 15:15:00 +0800 Subject: Synchronise the openstack bugs When run unittests through tox, some test cases are always error, the errors are already done in openstack community, so it's necessary to synchronise the fixes. Change-Id: Ib29078e6cc138a474e89c6a2cc90ad7a1db1bb46 JIRA: PARSER-63 Signed-off-by: shangxdy --- tosca2heat/tosca-parser/toscaparser/entity_template.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to '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 --- 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]) -- cgit 1.2.3-korg