Merge "Support version of tosca_simple_yaml_1_1"

[parser.git] / tosca2heat / tosca-parser / toscaparser / elements / tosca_type_validation.py

diff --git a/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py b/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py
index 16764bc..89a6a03 100644 (file)
--- a/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py
+++ b/tosca2heat/tosca-parser/toscaparser/elements/tosca_type_validation.py
@@ -22,13 +22,15 @@ class TypeValidation(object):
                              DSL_DEFINITIONS, NODE_TYPES, REPOSITORIES,
                              DATA_TYPES, ARTIFACT_TYPES, GROUP_TYPES,
                              RELATIONSHIP_TYPES, CAPABILITY_TYPES,
-                             INTERFACE_TYPES, POLICY_TYPES) = \
+                             INTERFACE_TYPES, POLICY_TYPES,
+                             TOPOLOGY_TEMPLATE, METADATA) = \
         ('tosca_definitions_version', 'description', 'imports',
          'dsl_definitions', 'node_types', 'repositories',
          'data_types', 'artifact_types', 'group_types',
          'relationship_types', 'capability_types',
-         'interface_types', 'policy_types')
-    VALID_TEMPLATE_VERSIONS = ['tosca_simple_yaml_1_0']
+         'interface_types', 'policy_types', 'topology_template', 'metadata')
+    VALID_TEMPLATE_VERSIONS = ['tosca_simple_yaml_1_0',
+                               'tosca_simple_yaml_1_1']
     exttools = ExtTools()
     VALID_TEMPLATE_VERSIONS.extend(exttools.get_versions())