openstack
/
heat-translator
Code Issues Proposed changes

Merge "Update TOSCA version per spec"

This commit is contained in:
Jenkins 2015-07-14 16:38:43 +00:00 committed by Gerrit Code Review
parent 5561dd2eff d88fdca5fc
commit dcd77567e5
58 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
translator/tests/test_utils.py
View File

@ -148,7 +148,7 @@ class CommonUtilsTest(TestCase):
os.path.dirname(os.path.abspath(__file__)),
'../toscalib/tests/data/custom_types/rsyslog.yaml')
dict = \
{'tosca_definitions_version': 'tosca_simple_yaml_1_0_0',
{'tosca_definitions_version': 'tosca_simple_yaml_1_0',
'description':
'RSYSLOG is the Rocket-fast SYStem for LOG processing.\n',
'node_types':
@ -181,7 +181,7 @@ class CommonUtilsTest(TestCase):
os.path.dirname(os.path.abspath(__file__)),
'../toscalib/tests/data/custom_types/collectd.yaml')
dict = \
{'tosca_definitions_version': 'tosca_simple_yaml_1_0_0',
{'tosca_definitions_version': 'tosca_simple_yaml_1_0',
'description':
'RSYSLOG is the Rocket-fast SYStem for LOG processing.\n',
'node_types':

2
translator/toscalib/elements/TOSCA_definition_1_0_0.yaml → translator/toscalib/elements/TOSCA_definition_1_0.yaml
View File

@ -15,7 +15,7 @@
# 1.0.0. It describes the definition for TOSCA types including Node Type,
# Relationship Type, Capability Type and Interfaces.
##########################################################################
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
##########################################################################
# Node Type.

2
translator/toscalib/elements/entitytype.py
View File

@ -30,7 +30,7 @@ class EntityType(object):
'''TOSCA definition file.'''
TOSCA_DEF_FILE = os.path.join(
os.path.dirname(os.path.abspath(__file__)),
"TOSCA_definition_1_0_0.yaml")
"TOSCA_definition_1_0.yaml")
loader = translator.toscalib.utils.yamlparser.load_yaml

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
collectd is a daemon which gathers statistics about the system it is running on.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Elasticsearch is an open-source search engine built on top of Apache Lucene, a full-text search-engine library.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Kibana is an open source analytics and visualization platform designed to work with Elasticsearch.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Logstash is a tool for receiving, processing and outputting logs. All kinds of logs. System logs, webserver logs,

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Pizza store app that allows you to explore the features provided by PayPal's REST APIs.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
RSYSLOG is the Rocket-fast SYStem for LOG processing.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
This TOSCA simple profile deploys nodejs, mongodb, elasticsearch, logstash and kibana each on a separate server

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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
collectd is a daemon which gathers statistics about the system it is running on.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Elasticsearch is an open-source search engine built on top of Apache Lucene,

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Kibana is an open source analytics and visualization platform designed to work with Elasticsearch.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Logstash is a tool for receiving, processing and outputting logs. All kinds

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Pizza store app that allows you to explore the features provided by PayPal's REST APIs.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
RSYSLOG is the Rocket-fast SYStem for LOG processing.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Tosca template for testing unknown node template name in get_attribute

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
TOSCA simple profile template to test invalid get_input function.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Tosca template for testing an unknown input.

2
translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
TOSCA simple profile with 1 network and 1 attached server

2
translator/toscalib/tests/data/network/tosca_one_server_three_networks.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
TOSCA simple profile with 3 networks and 1 attached server

2
translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
TOSCA simple profile with 1 server attached to existing network

2
translator/toscalib/tests/data/network/tosca_two_servers_one_network.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
TOSCA simple profile with 1 network and 2 attached servers

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Demonstrates how to attach a TOSCA BlockStorage node to a Compute node using

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
This use case shows 2 compute instances (2 tiers) with one BlockStorage node

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
This use case is like the Notation1 use case, but also creates two relationship

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
This use case demonstrates how two different TOSCA BlockStorage nodes can be

2
translator/toscalib/tests/data/storage/tosca_single_object_store.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Tosca template for testing a objectstorage template.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
A template to test host assignment for translated hot resources.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_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_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
TOSCA simple profile with invalid top-level key: 'node_template'.

2
translator/toscalib/tests/data/topology_template/definitions.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
node_types:
example.TransactionSubsystem:

2
translator/toscalib/tests/data/topology_template/subsystem.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
Service template with topology_template, act as a nested system inside another system.

2
translator/toscalib/tests/data/topology_template/system.yaml
View File

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
topology_template:
description: Template of online transaction processing service.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
This TOSCA simple profile deploys nodejs, mongodb, elasticsearch, logstash

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: Template for deploying a single server with predefined properties.

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
TOSCA simple profile with nodejs and mongodb.

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

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

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

@ -1,4 +1,4 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
tosca_definitions_version: tosca_simple_yaml_1_0
description: >
TOSCA simple profile for Compute.

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

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

2
translator/toscalib/tosca_template.py
View File

@ -41,7 +41,7 @@ YAML_LOADER = translator.toscalib.utils.yamlparser.load_yaml
class ToscaTemplate(object):
VALID_TEMPLATE_VERSIONS = ['tosca_simple_yaml_1_0_0']
VALID_TEMPLATE_VERSIONS = ['tosca_simple_yaml_1_0']
'''Load the template data.'''
def __init__(self, path):