summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser
diff options
context:
space:
mode:
authorjulien zhang <zhang.jun3g@zte.com.cn>2017-09-10 14:40:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-10 14:40:24 +0000
commit7c96fb6cb02a5bb8f957f7129bf6149e07dfa8c2 (patch)
tree7e7d05f781ff6fef99836e8fa754980c55af918d /tosca2heat/tosca-parser
parent792dd7acf8ac48ccb6fc35d99e4099559a2c9e9c (diff)
parent0e2c3b05b5d788635bba09c19487cf9fa23095ee (diff)
Merge "Fix StatefulEntityType when entitytype is not define"
Diffstat (limited to 'tosca2heat/tosca-parser')
-rw-r--r--tosca2heat/tosca-parser/toscaparser/elements/capabilitytype.py2
-rw-r--r--tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/elements/capabilitytype.py b/tosca2heat/tosca-parser/toscaparser/elements/capabilitytype.py
index 5fa9661..23c5afc 100644
--- a/tosca2heat/tosca-parser/toscaparser/elements/capabilitytype.py
+++ b/tosca2heat/tosca-parser/toscaparser/elements/capabilitytype.py
@@ -25,7 +25,7 @@ class CapabilityTypeDef(StatefulEntityType):
self.nodetype = ntype
self.properties = None
self.custom_def = custom_def
- if self.PROPERTIES in self.defs:
+ if self.defs and self.PROPERTIES in self.defs:
self.properties = self.defs[self.PROPERTIES]
self.parent_capabilities = self._get_parent_capabilities(custom_def)
diff --git a/tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py b/tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py
index 2f221b3..28ee697 100644
--- a/tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py
+++ b/tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py
@@ -46,7 +46,8 @@ class StatefulEntityType(EntityType):
elif custom_def and entitytype in list(custom_def.keys()):
self.defs = custom_def[entitytype]
else:
- self.defs = None
+ # avoid errors if self.defs = none
+ self.defs = {}
ExceptionCollector.appendException(
InvalidTypeError(what=entitytype))
self.type = entitytype