openstack/heat-translator
Code Issues Proposed changes

Update TOSCA version

Browse Source 
TOSCA version naming has been changed and per the latest specs the correct
current version is tosca_simple_yaml_1_0_0.

Change-Id: I8a7ddf70f6e74fac1134a0674e44c498f661d51e
Closes-Bug: #1339154
This commit is contained in:
spzala 2015-01-28 17:54:37 -08:00
parent 984637a299
commit c4e60a550a
34 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
translator/tests/data/tosca_blockstorage_with_attachment.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with server and attached block storage.

2
translator/tests/data/tosca_blockstorage_with_attachment_notation1.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with server and attached block storage.

2
translator/tests/data/tosca_blockstorage_with_attachment_notation2.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with server and attached block storage.

2
translator/tests/data/tosca_multiple_blockstorage_with_attachment.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with server and attached block storage.

2
translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/tosca_single_instance_wordpress.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with wordpress, web server and mysql on the same server.

2
translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/wordpress.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
tosca.nodes.WebApplication.WordPress:

2
translator/toscalib/tests/data/custom_types/collectd.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
tosca.nodes.SoftwareComponent.Collectd:

2
translator/toscalib/tests/data/custom_types/elasticsearch.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
dsl_definitions:
search_api_port: &search_api_port

2
translator/toscalib/tests/data/custom_types/kibana.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
tosca.nodes.SoftwareComponent.Kibana:

2
translator/toscalib/tests/data/custom_types/logstash.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
tosca.nodes.SoftwareComponent.Logstash:

2
translator/toscalib/tests/data/custom_types/nodejs.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
tosca.nodes.SoftwareComponent.Nodejs:

2
translator/toscalib/tests/data/custom_types/rsyslog.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
tosca.nodes.SoftwareComponent.Rsyslog:

2
translator/toscalib/tests/data/custom_types/wordpress.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
tosca.nodes.WebApplication.WordPress:

2
translator/toscalib/tests/data/datatypes/custom_datatype_def.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Custom type and node definition used to test custom datatypes.

2
translator/toscalib/tests/data/datatypes/test_custom_datatypes_in_current_template.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA templates used to test custom datatypes.

2
translator/toscalib/tests/data/datatypes/test_custom_datatypes_nested_datatype_error.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA templates used to test custom datatypes.

2
translator/toscalib/tests/data/datatypes/test_custom_datatypes_positive.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA templates used to test custom datatypes.

2
translator/toscalib/tests/data/datatypes/test_custom_datatypes_value_error.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA templates used to test custom datatypes.

2
translator/toscalib/tests/data/functions/test_get_attribute_host_keyword.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA template for testing get_attribute with HOST keyword.

2
translator/toscalib/tests/data/functions/test_get_attribute_host_not_found.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA template for testing get_attribute with HOST keyword.

2
translator/toscalib/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA template for testing get_attribute with HOST keyword.

2
translator/toscalib/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Tosca template for testing unknown attribute name in get_attribute

2
translator/toscalib/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Tosca template for testing unknown node template name in get_attribute

2
translator/toscalib/tests/data/functions/test_unknown_capability_property.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Tosca template for testing an unknown capability property.

2
translator/toscalib/tests/data/functions/test_unknown_input_in_interface.yaml
View File

@ -1,5 +1,5 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Tosca template for testing an unknown input.

2
translator/toscalib/tests/data/functions/test_unknown_input_in_property.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Tosca template for testing an unknown input.

2
translator/toscalib/tests/data/test_no_inputs_in_template.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Tosca template for testing a template with no inputs.

2
translator/toscalib/tests/data/test_no_outputs_in_template.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Tosca template for testing a template with no outputs.

2
translator/toscalib/tests/data/test_requirements.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
Test Requirements.

2
translator/toscalib/tests/data/test_tosca_normative_type_by_shortname.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with short type name for Compute.

2
translator/toscalib/tests/data/test_tosca_top_level_error2.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with invalid top-level key: 'node_template'.

2
translator/toscalib/tests/data/tosca_elk.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with nodejs, mongodb, elasticsearch, logstash, kibana, rsyslog and collectd.

2
translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_1.0
tosca_definitions_version: tosca_simple_yaml_1_0_0
description: >
TOSCA simple profile with wordpress, web server and mysql on the same server.

2
translator/toscalib/tests/test_toscatpl.py
View File

@ -34,7 +34,7 @@ class ToscaTemplateTest(TestCase):
"data/tosca_elk.yaml")
def test_version(self):
self.assertEqual(self.tosca.version, "tosca_simple_1.0")
self.assertEqual(self.tosca.version, "tosca_simple_yaml_1_0_0")
def test_description(self):
expected_description = "TOSCA simple profile with wordpress, " \