From c8201c119ec686e79797721156767685fe848aca Mon Sep 17 00:00:00 2001 From: shangxdy Date: Thu, 7 Apr 2016 14:08:49 -0400 Subject: Update tosca lib to version 0.5 Use tosca-parser and heat-translator to analyze to the basic nfv-tosca type definitions, and use simple tosca new feature such as policy, group and trigger, which are now supported by the latest version of tosca-parser and heat-translator. JIRA:PARSER-18 Change-Id: I797bcacbb5b32005d0aeb0f3f32851ac96e30f01 Signed--off-by: shangxdy Signed-off-by: shangxdy --- .../functions/test_get_attribute_host_keyword.yaml | 33 -------------------- .../test_get_attribute_host_not_found.yaml | 20 ------------ ...test_get_attribute_illegal_host_in_outputs.yaml | 17 ---------- .../test_get_attribute_unknown_attribute_name.yaml | 28 ----------------- ...t_get_attribute_unknown_node_template_name.yaml | 28 ----------------- .../functions/test_invalid_function_signature.yaml | 34 -------------------- .../test_unknown_capability_property.yaml | 36 ---------------------- .../functions/test_unknown_input_in_interface.yaml | 20 ------------ .../functions/test_unknown_input_in_property.yaml | 13 -------- 9 files changed, 229 deletions(-) delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_host_keyword.yaml delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_host_not_found.yaml delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_invalid_function_signature.yaml delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_capability_property.yaml delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_input_in_interface.yaml delete mode 100644 tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_input_in_property.yaml (limited to 'tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions') diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_host_keyword.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_host_keyword.yaml deleted file mode 100644 index 90ffbe2..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_host_keyword.yaml +++ /dev/null @@ -1,33 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - TOSCA template for testing get_attribute with HOST keyword. - -topology_template: - node_templates: - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - num_cpus: 2 - dbms: - type: tosca.nodes.DBMS - requirements: - - host: server - interfaces: - Standard: - configure: - implementation: configure.sh - inputs: - ip_address: { get_attribute: [ HOST, private_address ] } - database: - type: tosca.nodes.Database - requirements: - - host: dbms - interfaces: - Standard: - configure: - implementation: configure.sh - inputs: - ip_address: { get_attribute: [ HOST, private_address ] } diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_host_not_found.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_host_not_found.yaml deleted file mode 100644 index 69679ff..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_host_not_found.yaml +++ /dev/null @@ -1,20 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - TOSCA template for testing get_attribute with HOST keyword. - -topology_template: - node_templates: - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - num_cpus: 2 - interfaces: - Standard: - configure: - implementation: configure.sh - inputs: - ip_address: { get_attribute: [ HOST, private_address ] } - diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml deleted file mode 100644 index 6c7d9bb..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_illegal_host_in_outputs.yaml +++ /dev/null @@ -1,17 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - TOSCA template for testing get_attribute with HOST keyword. - -topology_template: - node_templates: - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - num_cpus: 2 - - outputs: - ip_address: - value: { get_attribute: [ HOST, private_address ] } diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml deleted file mode 100644 index 0570c7c..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_unknown_attribute_name.yaml +++ /dev/null @@ -1,28 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - Tosca template for testing unknown attribute name in get_attribute - function. - -topology_template: - inputs: - image_id: - type: string - - node_templates: - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - num_cpus: 2 - interfaces: - Standard: - configure: - implementation: start_server.sh - inputs: - image_id: { get_input: image_id } - - outputs: - ip_address: - value: { get_attribute: [ server, unknown_attribute ] } diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml deleted file mode 100644 index 923305c..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_get_attribute_unknown_node_template_name.yaml +++ /dev/null @@ -1,28 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - Tosca template for testing unknown node template name in get_attribute - function. - -topology_template: - inputs: - image_id: - type: string - - node_templates: - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - num_cpus: 2 - interfaces: - Standard: - configure: - implementation: start_server.sh - inputs: - image_id: { get_input: image_id } - - outputs: - ip_address: - value: { get_attribute: [ unknown_node_template, private_address ] } diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_invalid_function_signature.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_invalid_function_signature.yaml deleted file mode 100644 index dde8427..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_invalid_function_signature.yaml +++ /dev/null @@ -1,34 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - TOSCA simple profile template to test invalid get_input function. - -topology_template: - inputs: - cpus: - type: integer - description: Number of CPUs for the server. - constraints: - - valid_values: [ 1, 2, 4, 8 ] - - node_templates: - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - # compute properties (flavor) - disk_size: 10 GB - num_cpus: { get_input: [cpus, cpus] } - mem_size: 4096 MB - os: - properties: - architecture: x86_64 - type: Linux - distribution: Fedora - version: 18.0 - - outputs: - server_address: - description: IP address of server instance. - value: { get_attribute: [server, private_address] } diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_capability_property.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_capability_property.yaml deleted file mode 100644 index 4a92530..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_capability_property.yaml +++ /dev/null @@ -1,36 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - Tosca template for testing an unknown capability property. - -topology_template: - node_templates: - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - num_cpus: 2 - dbms: - type: tosca.nodes.DBMS - properties: - root_password: 1234 - port: 3672 - database: - type: tosca.nodes.Database - properties: - name: my_db - user: abcd - password: 1234 - capabilities: - database_endpoint: - properties: - port: { get_property: [ dbms, port ] } - requirements: - - host: dbms - interfaces: - Standard: - configure: - implementation: database_configure.sh - inputs: - db_port: { get_property: [ SELF, database_endpoint, unknown ] } diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_input_in_interface.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_input_in_interface.yaml deleted file mode 100644 index cbfb391..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_input_in_interface.yaml +++ /dev/null @@ -1,20 +0,0 @@ - -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - Tosca template for testing an unknown input. - -topology_template: - node_templates: - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - num_cpus: 2 - interfaces: - Standard: - configure: - implementation: start_server.sh - inputs: - image_id: { get_input: image_id } diff --git a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_input_in_property.yaml b/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_input_in_property.yaml deleted file mode 100644 index 9ba7ee5..0000000 --- a/tosca2heat/tosca-parser-0.3.0/toscaparser/tests/data/functions/test_unknown_input_in_property.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - Tosca template for testing an unknown input. - -topology_template: - node_templates: - obj_store_server: - type: tosca.nodes.ObjectStorage - properties: - name: { get_input: objectstore_name } - size: 1024 MB - maxsize: 1 GB -- cgit 1.2.3-korg