openstack/deb-python-tosca-parser
Code Issues Proposed changes

Changed datatype_definitions tag to data_types to match spec

Browse Source 
- Also fixed a mis-spelling and a swapped mapping in the
    type list

Closes-Bug: 1541517
Change-Id: Ia2c27996d65142a255932352760e6a5c0108071c
This commit is contained in:
Bob.Haddleton
2016-02-03 11:18:21 -06:00
parent 7b7f7c4f87
commit d8295ddcdc
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
toscaparser/elements/tosca_type_validation.py
View File

@@ -22,13 +22,12 @@ class TypeValidation(object):
DSL_DEFINITIONS, NODE_TYPES, REPOSITORIES, DSL_DEFINITIONS, NODE_TYPES, REPOSITORIES,
DATA_TYPES, ARTIFACT_TYPES, GROUP_TYPES, DATA_TYPES, ARTIFACT_TYPES, GROUP_TYPES,
RELATIONSHIP_TYPES, CAPABILITY_TYPES, RELATIONSHIP_TYPES, CAPABILITY_TYPES,
INTERFCAE_TYPES, POLICY_TYPES, DATATYPE_DEFINITIONS) = \ INTERFACE_TYPES, POLICY_TYPES) = \
('tosca_definitions_version', 'description', ('tosca_definitions_version', 'description', 'imports',
'imports', 'dsl_definitions', 'node_types', 'dsl_definitions', 'node_types', 'repositories',
'repositories', 'data_types', 'group_types', 'data_types', 'artifact_types', 'group_types',
'artifact_types', 'relationship_types', 'relationship_types', 'capability_types',
'capability_types', 'interface_types', 'interface_types', 'policy_types')
'policy_types', 'datatype_definitions')
VALID_TEMPLATE_VERSIONS = ['tosca_simple_yaml_1_0'] VALID_TEMPLATE_VERSIONS = ['tosca_simple_yaml_1_0']
exttools = ExtTools() exttools = ExtTools()
VALID_TEMPLATE_VERSIONS.extend(exttools.get_versions()) VALID_TEMPLATE_VERSIONS.extend(exttools.get_versions())

2
toscaparser/tests/data/datatypes/custom_datatype_def.yaml
View File

@@ -10,7 +10,7 @@ node_types:
people: people:
type: tosca.my.datatypes.People type: tosca.my.datatypes.People
datatype_definitions: data_types:
tosca.my.datatypes.PeopleBase: tosca.my.datatypes.PeopleBase:
properties: properties:
name: name:

4
toscaparser/tests/data/datatypes/test_custom_datatypes_in_current_template.yaml
View File

@@ -10,7 +10,7 @@ node_types:
people: people:
type: tosca.my.datatypes.People type: tosca.my.datatypes.People
datatype_definitions: data_types:
tosca.my.datatypes.PeopleBase: tosca.my.datatypes.PeopleBase:
properties: properties:
name: name:
@@ -62,4 +62,4 @@ topology_template:
contact_phone: '123456789'} contact_phone: '123456789'}
- {contact_name: Jerry, - {contact_name: Jerry,
contact_email: jerry@email.com, contact_email: jerry@email.com,
contact_phone: '321654987'} contact_phone: '321654987'}

6
toscaparser/tosca_template.py
View File

@@ -34,13 +34,13 @@ SECTIONS = (DEFINITION_VERSION, DEFAULT_NAMESPACE, TEMPLATE_NAME,
TOPOLOGY_TEMPLATE, TEMPLATE_AUTHOR, TEMPLATE_VERSION, TOPOLOGY_TEMPLATE, TEMPLATE_AUTHOR, TEMPLATE_VERSION,
DESCRIPTION, IMPORTS, DSL_DEFINITIONS, NODE_TYPES, DESCRIPTION, IMPORTS, DSL_DEFINITIONS, NODE_TYPES,
RELATIONSHIP_TYPES, RELATIONSHIP_TEMPLATES, RELATIONSHIP_TYPES, RELATIONSHIP_TEMPLATES,
CAPABILITY_TYPES, ARTIFACT_TYPES, DATATYPE_DEFINITIONS, CAPABILITY_TYPES, ARTIFACT_TYPES, DATA_TYPES,
POLICY_TYPES, GROUP_TYPES) = \ POLICY_TYPES, GROUP_TYPES) = \
('tosca_definitions_version', 'tosca_default_namespace', ('tosca_definitions_version', 'tosca_default_namespace',
'template_name', 'topology_template', 'template_author', 'template_name', 'topology_template', 'template_author',
'template_version', 'description', 'imports', 'dsl_definitions', 'template_version', 'description', 'imports', 'dsl_definitions',
'node_types', 'relationship_types', 'relationship_templates', 'node_types', 'relationship_types', 'relationship_templates',
'capability_types', 'artifact_types', 'datatype_definitions', 'capability_types', 'artifact_types', 'data_types',
'policy_types', 'group_types') 'policy_types', 'group_types')
# Sections that are specific to individual template definitions # Sections that are specific to individual template definitions
SPECIAL_SECTIONS = (METADATA) = ('metadata') SPECIAL_SECTIONS = (METADATA) = ('metadata')
@@ -145,7 +145,7 @@ class ToscaTemplate(object):
def _get_all_custom_defs(self, imports=None): def _get_all_custom_defs(self, imports=None):
types = [IMPORTS, NODE_TYPES, CAPABILITY_TYPES, RELATIONSHIP_TYPES, types = [IMPORTS, NODE_TYPES, CAPABILITY_TYPES, RELATIONSHIP_TYPES,
DATATYPE_DEFINITIONS, POLICY_TYPES, GROUP_TYPES] DATA_TYPES, POLICY_TYPES, GROUP_TYPES]
custom_defs_final = {} custom_defs_final = {}
custom_defs = self._get_custom_types(types, imports) custom_defs = self._get_custom_types(types, imports)
if custom_defs: if custom_defs: