diff --git a/translator/tests/data/tosca_blockstorage_with_attachment.yaml b/translator/tests/data/tosca_blockstorage_with_attachment.yaml index 30a7912d..251980e3 100644 --- a/translator/tests/data/tosca_blockstorage_with_attachment.yaml +++ b/translator/tests/data/tosca_blockstorage_with_attachment.yaml @@ -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. diff --git a/translator/tests/data/tosca_blockstorage_with_attachment_notation1.yaml b/translator/tests/data/tosca_blockstorage_with_attachment_notation1.yaml index 67cf90f5..78e091b9 100644 --- a/translator/tests/data/tosca_blockstorage_with_attachment_notation1.yaml +++ b/translator/tests/data/tosca_blockstorage_with_attachment_notation1.yaml @@ -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. diff --git a/translator/tests/data/tosca_blockstorage_with_attachment_notation2.yaml b/translator/tests/data/tosca_blockstorage_with_attachment_notation2.yaml index 47b5e82f..9158a49c 100644 --- a/translator/tests/data/tosca_blockstorage_with_attachment_notation2.yaml +++ b/translator/tests/data/tosca_blockstorage_with_attachment_notation2.yaml @@ -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. diff --git a/translator/tests/data/tosca_multiple_blockstorage_with_attachment.yaml b/translator/tests/data/tosca_multiple_blockstorage_with_attachment.yaml index 0246af82..955317a8 100644 --- a/translator/tests/data/tosca_multiple_blockstorage_with_attachment.yaml +++ b/translator/tests/data/tosca_multiple_blockstorage_with_attachment.yaml @@ -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. 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 e9013978..8645e7b7 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_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. 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 01b48363..83170daa 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 3afb6dba..4ced6287 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: tosca.nodes.SoftwareComponent.Collectd: diff --git a/translator/toscalib/tests/data/custom_types/elasticsearch.yaml b/translator/toscalib/tests/data/custom_types/elasticsearch.yaml index fd71b0f8..d307e68d 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 dsl_definitions: search_api_port: &search_api_port diff --git a/translator/toscalib/tests/data/custom_types/kibana.yaml b/translator/toscalib/tests/data/custom_types/kibana.yaml index 5457ca6b..0cb2b166 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: tosca.nodes.SoftwareComponent.Kibana: diff --git a/translator/toscalib/tests/data/custom_types/logstash.yaml b/translator/toscalib/tests/data/custom_types/logstash.yaml index be561ad9..cbb2d20b 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: tosca.nodes.SoftwareComponent.Logstash: diff --git a/translator/toscalib/tests/data/custom_types/nodejs.yaml b/translator/toscalib/tests/data/custom_types/nodejs.yaml index 4c2e1f2a..071adc23 100644 --- a/translator/toscalib/tests/data/custom_types/nodejs.yaml +++ b/translator/toscalib/tests/data/custom_types/nodejs.yaml @@ -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: diff --git a/translator/toscalib/tests/data/custom_types/rsyslog.yaml b/translator/toscalib/tests/data/custom_types/rsyslog.yaml index 664c68c8..3cb8a1d2 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: tosca.nodes.SoftwareComponent.Rsyslog: diff --git a/translator/toscalib/tests/data/custom_types/wordpress.yaml b/translator/toscalib/tests/data/custom_types/wordpress.yaml index 35911318..a470b567 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 bf0d4c35..c44beb9e 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 d8b7c51f..fa5e290d 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 480751ba..0612e8c5 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 b6091f71..1def6b6e 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 2a48fb1e..c622ecbd 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 33437291..99c96f0d 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 0a9308b8..905b98e1 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 65b398c7..0b661985 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 ff488b0b..4bc9101e 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 858b5f6d..fe0f8663 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 description: > Tosca template for testing unknown node template name in get_attribute 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 5a5e1c8d..3a6b15b9 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 bd1ae551..8883b5bb 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 b2d6651c..5fcdde62 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 description: > Tosca template for testing an unknown input. 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 487f16e5..82800749 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 91e742b2..93adca91 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 ba2eda16..0d5480f8 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 3f26c201..e6f6de36 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_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 917b2187..3ac65cf0 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 description: > TOSCA simple profile with invalid top-level key: 'node_template'. diff --git a/translator/toscalib/tests/data/tosca_elk.yaml b/translator/toscalib/tests/data/tosca_elk.yaml index 53f21583..4d3faebb 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_1.0 +tosca_definitions_version: tosca_simple_yaml_1_0_0 description: > TOSCA simple profile with nodejs, mongodb, elasticsearch, logstash, kibana, rsyslog and collectd. diff --git a/translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml b/translator/toscalib/tests/data/tosca_single_instance_wordpress.yaml index f5fc48c2..0740070d 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_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. diff --git a/translator/toscalib/tests/test_toscatpl.py b/translator/toscalib/tests/test_toscatpl.py index 03742f40..38bfa38a 100644 --- a/translator/toscalib/tests/test_toscatpl.py +++ b/translator/toscalib/tests/test_toscatpl.py @@ -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, " \