Merge "Update TOSCA version per spec"

2015-07-14 16:38:43 +00:00
parent 5561dd2eff d88fdca5fc
commit dcd77567e5
58 changed files with 59 additions and 59 deletions
--- a/translator/tests/test_utils.py
+++ b/translator/tests/test_utils.py
@@ -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':
--- a/translator/toscalib/elements/TOSCA_definition_1_0_0.yaml
+++ b/translator/toscalib/elements/TOSCA_definition_1_0_0.yaml
@@ -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.
--- a/translator/toscalib/elements/entitytype.py
+++ b/translator/toscalib/elements/entitytype.py
@@ -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

--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml
@@ -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.
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml
@@ -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.
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml
@@ -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.
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml
@@ -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,
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml
@@ -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.
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml
@@ -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.
--- a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml
@@ -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
--- a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/tosca_single_instance_wordpress.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/tosca_single_instance_wordpress.yaml
@@ -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.
--- a/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/wordpress.yaml
+++ b/translator/toscalib/tests/data/CSAR/tosca_single_instance_wordpress/Definitions/wordpress.yaml
@@ -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:
--- a/translator/toscalib/tests/data/custom_types/collectd.yaml
+++ b/translator/toscalib/tests/data/custom_types/collectd.yaml
@@ -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.
--- a/translator/toscalib/tests/data/custom_types/elasticsearch.yaml
+++ b/translator/toscalib/tests/data/custom_types/elasticsearch.yaml
@@ -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/translator/toscalib/tests/data/custom_types/kibana.yaml
+++ b/translator/toscalib/tests/data/custom_types/kibana.yaml
@@ -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.
--- a/translator/toscalib/tests/data/custom_types/logstash.yaml
+++ b/translator/toscalib/tests/data/custom_types/logstash.yaml
@@ -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
--- a/translator/toscalib/tests/data/custom_types/paypalpizzastore_nodejs_app.yaml
+++ b/translator/toscalib/tests/data/custom_types/paypalpizzastore_nodejs_app.yaml
@@ -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.
--- a/translator/toscalib/tests/data/custom_types/rsyslog.yaml
+++ b/translator/toscalib/tests/data/custom_types/rsyslog.yaml
@@ -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.
--- a/translator/toscalib/tests/data/custom_types/wordpress.yaml
+++ b/translator/toscalib/tests/data/custom_types/wordpress.yaml
@@ -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:
--- a/translator/toscalib/tests/data/datatypes/custom_datatype_def.yaml
+++ b/translator/toscalib/tests/data/datatypes/custom_datatype_def.yaml
@@ -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.
--- a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_in_current_template.yaml
+++ b/translator/toscalib/tests/data/datatypes/test_custom_datatypes_in_current_template.yaml
@@ -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.
--- a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_nested_datatype_error.yaml
+++ b/translator/toscalib/tests/data/datatypes/test_custom_datatypes_nested_datatype_error.yaml
@@ -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.
--- a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_positive.yaml
+++ b/translator/toscalib/tests/data/datatypes/test_custom_datatypes_positive.yaml
@@ -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.
--- a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_value_error.yaml
+++ b/translator/toscalib/tests/data/datatypes/test_custom_datatypes_value_error.yaml
@@ -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.
--- a/translator/toscalib/tests/data/functions/test_get_attribute_host_keyword.yaml
+++ b/translator/toscalib/tests/data/functions/test_get_attribute_host_keyword.yaml
@@ -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.
--- a/translator/toscalib/tests/data/functions/test_get_attribute_host_not_found.yaml
+++ b/translator/toscalib/tests/data/functions/test_get_attribute_host_not_found.yaml
@@ -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.
--- a/translator/toscalib/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml
+++ b/translator/toscalib/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml
@@ -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.
--- a/translator/toscalib/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml
+++ b/translator/toscalib/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml
@@ -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
--- a/translator/toscalib/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml
+++ b/translator/toscalib/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml
@@ -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
--- a/translator/toscalib/tests/data/functions/test_invalid_function_signature.yaml
+++ b/translator/toscalib/tests/data/functions/test_invalid_function_signature.yaml
@@ -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.
--- a/translator/toscalib/tests/data/functions/test_unknown_capability_property.yaml
+++ b/translator/toscalib/tests/data/functions/test_unknown_capability_property.yaml
@@ -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.
--- a/translator/toscalib/tests/data/functions/test_unknown_input_in_interface.yaml
+++ b/translator/toscalib/tests/data/functions/test_unknown_input_in_interface.yaml
@@ -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.
--- a/translator/toscalib/tests/data/functions/test_unknown_input_in_property.yaml
+++ b/translator/toscalib/tests/data/functions/test_unknown_input_in_property.yaml
@@ -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.
--- a/translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml
+++ b/translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml
@@ -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
--- a/translator/toscalib/tests/data/network/tosca_one_server_three_networks.yaml
+++ b/translator/toscalib/tests/data/network/tosca_one_server_three_networks.yaml
@@ -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
--- a/translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml
+++ b/translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml
@@ -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
--- a/translator/toscalib/tests/data/network/tosca_two_servers_one_network.yaml
+++ b/translator/toscalib/tests/data/network/tosca_two_servers_one_network.yaml
@@ -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
--- a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment.yaml
+++ b/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment.yaml
@@ -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
--- a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml
+++ b/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml
@@ -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
--- a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml
+++ b/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml
@@ -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
--- a/translator/toscalib/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml
+++ b/translator/toscalib/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml
@@ -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
--- a/translator/toscalib/tests/data/storage/tosca_single_object_store.yaml
+++ b/translator/toscalib/tests/data/storage/tosca_single_object_store.yaml
@@ -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.
--- a/translator/toscalib/tests/data/test_host_assignment.yaml
+++ b/translator/toscalib/tests/data/test_host_assignment.yaml
@@ -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.
--- a/translator/toscalib/tests/data/test_no_inputs_in_template.yaml
+++ b/translator/toscalib/tests/data/test_no_inputs_in_template.yaml
@@ -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.
--- a/translator/toscalib/tests/data/test_no_outputs_in_template.yaml
+++ b/translator/toscalib/tests/data/test_no_outputs_in_template.yaml
@@ -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.
--- a/translator/toscalib/tests/data/test_requirements.yaml
+++ b/translator/toscalib/tests/data/test_requirements.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
+tosca_definitions_version: tosca_simple_yaml_1_0

 description: >
  Test Requirements.
--- a/translator/toscalib/tests/data/test_tosca_normative_type_by_shortname.yaml
+++ b/translator/toscalib/tests/data/test_tosca_normative_type_by_shortname.yaml
@@ -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.
--- a/translator/toscalib/tests/data/test_tosca_top_level_error2.yaml
+++ b/translator/toscalib/tests/data/test_tosca_top_level_error2.yaml
@@ -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'.
--- a/translator/toscalib/tests/data/topology_template/definitions.yaml
+++ b/translator/toscalib/tests/data/topology_template/definitions.yaml
@@ -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:
--- a/translator/toscalib/tests/data/topology_template/subsystem.yaml
+++ b/translator/toscalib/tests/data/topology_template/subsystem.yaml
@@ -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.
--- a/translator/toscalib/tests/data/topology_template/system.yaml
+++ b/translator/toscalib/tests/data/topology_template/system.yaml
@@ -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.
--- a/translator/toscalib/tests/data/tosca_elk.yaml
+++ b/translator/toscalib/tests/data/tosca_elk.yaml
@@ -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
--- a/translator/toscalib/tests/data/tosca_helloworld.yaml
+++ b/translator/toscalib/tests/data/tosca_helloworld.yaml
@@ -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.

--- a/translator/toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml
+++ b/translator/toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml
@@ -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.
--- a/translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml
+++ b/translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml
@@ -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.
--- a/translator/toscalib/tests/data/tosca_single_server.yaml
+++ b/translator/toscalib/tests/data/tosca_single_server.yaml
@@ -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.
--- a/translator/toscalib/tests/test_toscatpl.py
+++ b/translator/toscalib/tests/test_toscatpl.py
@@ -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, " \
--- a/translator/toscalib/tosca_template.py
+++ b/translator/toscalib/tosca_template.py
@@ -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):