From d88fdca5fc6dc0e68d7ae4b61fac6d4259b76ac1 Mon Sep 17 00:00:00 2001
From: spzala <spzala@us.ibm.com>
Date: Sat, 11 Jul 2015 10:25:51 -0700
Subject: [PATCH] Update TOSCA version per spec

The TOSCA spec versioning has been changed to 1_0 from 1_0_0.

Change-Id: Id556911d52ae5407c26fbf4fca0d4252cb432ce1
---
 translator/tests/test_utils.py                                | 4 ++--
 ...{TOSCA_definition_1_0_0.yaml => TOSCA_definition_1_0.yaml} | 2 +-
 translator/toscalib/elements/entitytype.py                    | 2 +-
 .../tests/data/CSAR/tosca_elk/Definitions/collectd.yaml       | 2 +-
 .../tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml  | 2 +-
 .../tests/data/CSAR/tosca_elk/Definitions/kibana.yaml         | 2 +-
 .../tests/data/CSAR/tosca_elk/Definitions/logstash.yaml       | 2 +-
 .../tosca_elk/Definitions/paypalpizzastore_nodejs_app.yaml    | 2 +-
 .../tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml        | 2 +-
 .../tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml      | 2 +-
 .../Definitions/tosca_single_instance_wordpress.yaml          | 2 +-
 .../Definitions/wordpress.yaml                                | 2 +-
 translator/toscalib/tests/data/custom_types/collectd.yaml     | 2 +-
 .../toscalib/tests/data/custom_types/elasticsearch.yaml       | 2 +-
 translator/toscalib/tests/data/custom_types/kibana.yaml       | 2 +-
 translator/toscalib/tests/data/custom_types/logstash.yaml     | 2 +-
 .../tests/data/custom_types/paypalpizzastore_nodejs_app.yaml  | 2 +-
 translator/toscalib/tests/data/custom_types/rsyslog.yaml      | 2 +-
 translator/toscalib/tests/data/custom_types/wordpress.yaml    | 2 +-
 .../toscalib/tests/data/datatypes/custom_datatype_def.yaml    | 2 +-
 .../datatypes/test_custom_datatypes_in_current_template.yaml  | 2 +-
 .../test_custom_datatypes_nested_datatype_error.yaml          | 2 +-
 .../tests/data/datatypes/test_custom_datatypes_positive.yaml  | 2 +-
 .../data/datatypes/test_custom_datatypes_value_error.yaml     | 2 +-
 .../tests/data/functions/test_get_attribute_host_keyword.yaml | 2 +-
 .../data/functions/test_get_attribute_host_not_found.yaml     | 2 +-
 .../functions/test_get_attribute_illegal_host_in_outputs.yaml | 2 +-
 .../functions/test_get_attribute_unknown_attribute_name.yaml  | 2 +-
 .../test_get_attribute_unknown_node_template_name.yaml        | 2 +-
 .../tests/data/functions/test_invalid_function_signature.yaml | 2 +-
 .../data/functions/test_unknown_capability_property.yaml      | 2 +-
 .../tests/data/functions/test_unknown_input_in_interface.yaml | 2 +-
 .../tests/data/functions/test_unknown_input_in_property.yaml  | 2 +-
 .../tests/data/network/tosca_one_server_one_network.yaml      | 2 +-
 .../tests/data/network/tosca_one_server_three_networks.yaml   | 2 +-
 .../tests/data/network/tosca_server_on_existing_network.yaml  | 2 +-
 .../tests/data/network/tosca_two_servers_one_network.yaml     | 2 +-
 .../data/storage/tosca_blockstorage_with_attachment.yaml      | 2 +-
 .../storage/tosca_blockstorage_with_attachment_notation1.yaml | 2 +-
 .../storage/tosca_blockstorage_with_attachment_notation2.yaml | 2 +-
 .../storage/tosca_multiple_blockstorage_with_attachment.yaml  | 2 +-
 .../tests/data/storage/tosca_single_object_store.yaml         | 2 +-
 translator/toscalib/tests/data/test_host_assignment.yaml      | 2 +-
 .../toscalib/tests/data/test_no_inputs_in_template.yaml       | 2 +-
 .../toscalib/tests/data/test_no_outputs_in_template.yaml      | 2 +-
 translator/toscalib/tests/data/test_requirements.yaml         | 2 +-
 .../tests/data/test_tosca_normative_type_by_shortname.yaml    | 2 +-
 .../toscalib/tests/data/test_tosca_top_level_error2.yaml      | 2 +-
 .../toscalib/tests/data/topology_template/definitions.yaml    | 2 +-
 .../toscalib/tests/data/topology_template/subsystem.yaml      | 2 +-
 translator/toscalib/tests/data/topology_template/system.yaml  | 2 +-
 translator/toscalib/tests/data/tosca_elk.yaml                 | 2 +-
 translator/toscalib/tests/data/tosca_helloworld.yaml          | 2 +-
 .../tests/data/tosca_nodejs_mongodb_two_instances.yaml        | 2 +-
 .../toscalib/tests/data/tosca_single_instance_wordpress.yaml  | 2 +-
 translator/toscalib/tests/data/tosca_single_server.yaml       | 2 +-
 translator/toscalib/tests/test_toscatpl.py                    | 2 +-
 translator/toscalib/tosca_template.py                         | 2 +-
 58 files changed, 59 insertions(+), 59 deletions(-)
 rename translator/toscalib/elements/{TOSCA_definition_1_0_0.yaml => TOSCA_definition_1_0.yaml} (99%)

diff --git a/translator/tests/test_utils.py b/translator/tests/test_utils.py
index eee8238..8cb1d6c 100644
--- 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':
diff --git a/translator/toscalib/elements/TOSCA_definition_1_0_0.yaml b/translator/toscalib/elements/TOSCA_definition_1_0.yaml
similarity index 99%
rename from translator/toscalib/elements/TOSCA_definition_1_0_0.yaml
rename to translator/toscalib/elements/TOSCA_definition_1_0.yaml
index 542a226..744da1c 100644
--- a/translator/toscalib/elements/TOSCA_definition_1_0_0.yaml
+++ b/translator/toscalib/elements/TOSCA_definition_1_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.
diff --git a/translator/toscalib/elements/entitytype.py b/translator/toscalib/elements/entitytype.py
index 15adf81..70e4b11 100644
--- 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
 
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/collectd.yaml
index 2e87b2a..1ac0935 100644
--- 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.
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/elasticsearch.yaml
index 7340613..4a1770f 100644
--- 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.
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/kibana.yaml
index a45d7eb..3a4351c 100644
--- 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.
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/logstash.yaml
index b9ec30f..8495954 100644
--- 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,
diff --git 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
index 41a2e97..d62c4c1 100644
--- 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.
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/rsyslog.yaml
index e5db47b..4614ee7 100644
--- 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.
diff --git a/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml b/translator/toscalib/tests/data/CSAR/tosca_elk/Definitions/tosca_elk.yaml
index e3a6867..66cc04b 100644
--- 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
diff --git 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
index 827fb2d..902234a 100644
--- 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.
diff --git 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
index cc1ecd6..b94dcae 100644
--- 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:
diff --git a/translator/toscalib/tests/data/custom_types/collectd.yaml b/translator/toscalib/tests/data/custom_types/collectd.yaml
index 2e87b2a..1ac0935 100644
--- 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.
diff --git a/translator/toscalib/tests/data/custom_types/elasticsearch.yaml b/translator/toscalib/tests/data/custom_types/elasticsearch.yaml
index cd16340..b140a32 100644
--- 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,
diff --git a/translator/toscalib/tests/data/custom_types/kibana.yaml b/translator/toscalib/tests/data/custom_types/kibana.yaml
index ae085b9..5701e69 100644
--- 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.
diff --git a/translator/toscalib/tests/data/custom_types/logstash.yaml b/translator/toscalib/tests/data/custom_types/logstash.yaml
index bebb9bf..cf60521 100644
--- 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
diff --git a/translator/toscalib/tests/data/custom_types/paypalpizzastore_nodejs_app.yaml b/translator/toscalib/tests/data/custom_types/paypalpizzastore_nodejs_app.yaml
index 41a2e97..d62c4c1 100644
--- 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.
diff --git a/translator/toscalib/tests/data/custom_types/rsyslog.yaml b/translator/toscalib/tests/data/custom_types/rsyslog.yaml
index e5db47b..4614ee7 100644
--- 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.
diff --git a/translator/toscalib/tests/data/custom_types/wordpress.yaml b/translator/toscalib/tests/data/custom_types/wordpress.yaml
index fd1677b..3115e09 100644
--- 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:
diff --git a/translator/toscalib/tests/data/datatypes/custom_datatype_def.yaml b/translator/toscalib/tests/data/datatypes/custom_datatype_def.yaml
index c44beb9..4b7da71 100644
--- 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.
diff --git 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
index 77bd4e3..aefe862 100644
--- 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.
diff --git 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
index 8c52f7d..b28f499 100644
--- 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.
diff --git a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_positive.yaml b/translator/toscalib/tests/data/datatypes/test_custom_datatypes_positive.yaml
index 657201a..f1762f4 100644
--- 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.
diff --git a/translator/toscalib/tests/data/datatypes/test_custom_datatypes_value_error.yaml b/translator/toscalib/tests/data/datatypes/test_custom_datatypes_value_error.yaml
index 94ba2bb..31cf681 100644
--- 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.
diff --git a/translator/toscalib/tests/data/functions/test_get_attribute_host_keyword.yaml b/translator/toscalib/tests/data/functions/test_get_attribute_host_keyword.yaml
index c912edb..90ffbe2 100644
--- 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.
diff --git 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
index cc84bd2..69679ff 100644
--- 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.
diff --git 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
index 0733e4b..6c7d9bb 100644
--- 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.
diff --git 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
index 0a20933..0570c7c 100644
--- 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
diff --git 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
index 1351953..923305c 100644
--- 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
diff --git a/translator/toscalib/tests/data/functions/test_invalid_function_signature.yaml b/translator/toscalib/tests/data/functions/test_invalid_function_signature.yaml
index fa1a085..a79609d 100644
--- 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.
diff --git a/translator/toscalib/tests/data/functions/test_unknown_capability_property.yaml b/translator/toscalib/tests/data/functions/test_unknown_capability_property.yaml
index 25ec2f3..4a92530 100644
--- 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.
diff --git a/translator/toscalib/tests/data/functions/test_unknown_input_in_interface.yaml b/translator/toscalib/tests/data/functions/test_unknown_input_in_interface.yaml
index aa893f3..cbfb391 100644
--- 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.
diff --git a/translator/toscalib/tests/data/functions/test_unknown_input_in_property.yaml b/translator/toscalib/tests/data/functions/test_unknown_input_in_property.yaml
index b2cea37..eb42afa 100644
--- 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.
diff --git a/translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml b/translator/toscalib/tests/data/network/tosca_one_server_one_network.yaml
index d63840d..a485d70 100644
--- 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
diff --git a/translator/toscalib/tests/data/network/tosca_one_server_three_networks.yaml b/translator/toscalib/tests/data/network/tosca_one_server_three_networks.yaml
index db0b3a4..afa864a 100644
--- 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
diff --git a/translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml b/translator/toscalib/tests/data/network/tosca_server_on_existing_network.yaml
index fc3a427..3029c0f 100644
--- 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
diff --git a/translator/toscalib/tests/data/network/tosca_two_servers_one_network.yaml b/translator/toscalib/tests/data/network/tosca_two_servers_one_network.yaml
index d5ed2f6..c3137dc 100644
--- 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
diff --git a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment.yaml b/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment.yaml
index 4a8a0ed..2f2c3d9 100644
--- 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
diff --git a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml b/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation1.yaml
index 926c647..6b10047 100644
--- 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
diff --git a/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml b/translator/toscalib/tests/data/storage/tosca_blockstorage_with_attachment_notation2.yaml
index d8bee09..0fe7807 100644
--- 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
diff --git a/translator/toscalib/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml b/translator/toscalib/tests/data/storage/tosca_multiple_blockstorage_with_attachment.yaml
index a7d9517..8e08e38 100644
--- 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
diff --git a/translator/toscalib/tests/data/storage/tosca_single_object_store.yaml b/translator/toscalib/tests/data/storage/tosca_single_object_store.yaml
index b58e662..10f843b 100644
--- 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.
diff --git a/translator/toscalib/tests/data/test_host_assignment.yaml b/translator/toscalib/tests/data/test_host_assignment.yaml
index 985ec61..acffd24 100644
--- 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.
diff --git a/translator/toscalib/tests/data/test_no_inputs_in_template.yaml b/translator/toscalib/tests/data/test_no_inputs_in_template.yaml
index 1478739..9be54ef 100644
--- 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.
diff --git a/translator/toscalib/tests/data/test_no_outputs_in_template.yaml b/translator/toscalib/tests/data/test_no_outputs_in_template.yaml
index 3bbb8d1..51d42ff 100644
--- 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.
diff --git a/translator/toscalib/tests/data/test_requirements.yaml b/translator/toscalib/tests/data/test_requirements.yaml
index 9c69472..5491ed0 100644
--- 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.
diff --git a/translator/toscalib/tests/data/test_tosca_normative_type_by_shortname.yaml b/translator/toscalib/tests/data/test_tosca_normative_type_by_shortname.yaml
index 0042ae1..21bcf87 100644
--- 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.
diff --git a/translator/toscalib/tests/data/test_tosca_top_level_error2.yaml b/translator/toscalib/tests/data/test_tosca_top_level_error2.yaml
index b9a4972..7c61e82 100644
--- 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'.
diff --git a/translator/toscalib/tests/data/topology_template/definitions.yaml b/translator/toscalib/tests/data/topology_template/definitions.yaml
index d9af96d..ab43050 100644
--- 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:
diff --git a/translator/toscalib/tests/data/topology_template/subsystem.yaml b/translator/toscalib/tests/data/topology_template/subsystem.yaml
index 8b05d7a..ddbc94e 100644
--- 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.
diff --git a/translator/toscalib/tests/data/topology_template/system.yaml b/translator/toscalib/tests/data/topology_template/system.yaml
index c32453b..350e94e 100644
--- 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.
diff --git a/translator/toscalib/tests/data/tosca_elk.yaml b/translator/toscalib/tests/data/tosca_elk.yaml
index f794173..ee75420 100644
--- 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
diff --git a/translator/toscalib/tests/data/tosca_helloworld.yaml b/translator/toscalib/tests/data/tosca_helloworld.yaml
index 378655d..5b913ff 100644
--- 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.
 
diff --git a/translator/toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml b/translator/toscalib/tests/data/tosca_nodejs_mongodb_two_instances.yaml
index 276752a..fcb672b 100644
--- 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.
diff --git a/translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml b/translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml
index 43ca456..cf89501 100644
--- 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.
diff --git a/translator/toscalib/tests/data/tosca_single_server.yaml b/translator/toscalib/tests/data/tosca_single_server.yaml
index ed07784..2b440b1 100644
--- 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.
diff --git a/translator/toscalib/tests/test_toscatpl.py b/translator/toscalib/tests/test_toscatpl.py
index 022ef28..323257b 100644
--- 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, " \
diff --git a/translator/toscalib/tosca_template.py b/translator/toscalib/tosca_template.py
index e67e41e..c9c2f69 100644
--- 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):