diff options
author | shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-19 14:23:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-19 14:23:44 +0000 |
commit | be620c74d492cb2e4b9ad3055832e36849a3ac6b (patch) | |
tree | 5d919e23cf404d4aa8d999dd7dfc6f7b30d2d48e /tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py | |
parent | 86b894e80fcb29f0354109730ee37bff20b1a89b (diff) | |
parent | f977b94e012828cd2a905b9b841aff33c4b732f8 (diff) |
Merge "Update the upstream of tosco-parser and heat-translator to stable release 0.6/0.5"
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py')
-rw-r--r-- | tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py b/tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py index 47496f7..be9933e 100644 --- a/tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py +++ b/tosca2heat/tosca-parser/toscaparser/elements/statefulentitytype.py @@ -15,6 +15,7 @@ from toscaparser.common.exception import InvalidTypeError from toscaparser.elements.attribute_definition import AttributeDef from toscaparser.elements.entity_type import EntityType from toscaparser.elements.property_definition import PropertyDef +from toscaparser.unsupportedtype import UnsupportedType class StatefulEntityType(EntityType): @@ -31,17 +32,20 @@ class StatefulEntityType(EntityType): def __init__(self, entitytype, prefix, custom_def=None): entire_entitytype = entitytype - if not entitytype.startswith(self.TOSCA): - entire_entitytype = prefix + entitytype - if entire_entitytype in list(self.TOSCA_DEF.keys()): - self.defs = self.TOSCA_DEF[entire_entitytype] - entitytype = entire_entitytype - elif custom_def and entitytype in list(custom_def.keys()): - self.defs = custom_def[entitytype] - else: + if UnsupportedType.validate_type(entire_entitytype): self.defs = None - ExceptionCollector.appendException( - InvalidTypeError(what=entitytype)) + else: + if not entitytype.startswith(self.TOSCA): + entire_entitytype = prefix + entitytype + if entire_entitytype in list(self.TOSCA_DEF.keys()): + self.defs = self.TOSCA_DEF[entire_entitytype] + entitytype = entire_entitytype + elif custom_def and entitytype in list(custom_def.keys()): + self.defs = custom_def[entitytype] + else: + self.defs = None + ExceptionCollector.appendException( + InvalidTypeError(what=entitytype)) self.type = entitytype def get_properties_def_objects(self): |