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/entity_template.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/entity_template.py')
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/entity_template.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/entity_template.py b/tosca2heat/tosca-parser/toscaparser/entity_template.py index 7488c33..7ce8cec 100644 --- a/tosca2heat/tosca-parser/toscaparser/entity_template.py +++ b/tosca2heat/tosca-parser/toscaparser/entity_template.py @@ -21,6 +21,7 @@ from toscaparser.elements.nodetype import NodeType from toscaparser.elements.policytype import PolicyType from toscaparser.elements.relationshiptype import RelationshipType from toscaparser.properties import Property +from toscaparser.unsupportedtype import UnsupportedType from toscaparser.utils.gettextutils import _ @@ -44,8 +45,9 @@ class EntityTemplate(object): self.entity_tpl = template self.custom_def = custom_def self._validate_field(self.entity_tpl) + type = self.entity_tpl.get('type') + UnsupportedType.validate_type(type) if entity_name == 'node_type': - type = self.entity_tpl.get('type') self.type_definition = NodeType(type, custom_def) \ if type is not None else None if entity_name == 'relationship_type': @@ -57,10 +59,10 @@ class EntityTemplate(object): type = self.entity_tpl['relationship'] else: type = self.entity_tpl['type'] + UnsupportedType.validate_type(type) self.type_definition = RelationshipType(type, None, custom_def) if entity_name == 'policy_type': - type = self.entity_tpl.get('type') if not type: msg = (_('Policy definition of "%(pname)s" must have' ' a "type" ''attribute.') % dict(pname=name)) @@ -69,7 +71,6 @@ class EntityTemplate(object): self.type_definition = PolicyType(type, custom_def) if entity_name == 'group_type': - type = self.entity_tpl.get('type') self.type_definition = GroupType(type, custom_def) \ if type is not None else None self._properties = None |