From 04387deeab820e75c6d37d2ddd5b514cb7bcfd9e Mon Sep 17 00:00:00 2001 From: Pavel Aharoni Date: Sun, 11 Jun 2017 14:33:57 +0300 Subject: [SDC-32] separate Tosca Parser from DC Change-Id: I7e7f31ff2bd92fec22031f75b7051d129a21d01b Signed-off-by: Pavel Aharoni --- .../validate/queuingsubsystem_invalid_input.yaml | 76 ---------------------- .../validate/system_invalid_input.yaml | 24 ------- .../test_example_app_substitution_mappings.yaml | 70 -------------------- .../test_substitution_mappings_invalid_output.yaml | 31 --------- .../test_substitution_mappings_valid_output.yaml | 31 --------- 5 files changed, 232 deletions(-) delete mode 100644 jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/queuingsubsystem_invalid_input.yaml delete mode 100644 jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/system_invalid_input.yaml delete mode 100644 jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_example_app_substitution_mappings.yaml delete mode 100644 jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_invalid_output.yaml delete mode 100644 jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_valid_output.yaml (limited to 'jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate') diff --git a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/queuingsubsystem_invalid_input.yaml b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/queuingsubsystem_invalid_input.yaml deleted file mode 100644 index 67ef341..0000000 --- a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/queuingsubsystem_invalid_input.yaml +++ /dev/null @@ -1,76 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - This template is a test template which contains invalid input needed for substitution mappings. - The required properties without default value in substituted node template which be mapped must be - as inputs of nested service template which defines substutition mappings, and the inputs of nested - service template which are not in the properties of the substituted node template must provide - default values. - This template provides an additional input of server_port1/my_cpus/my_input which are not defined - in example.QueuingSubsystem, and the default value are 8080/2/123, all of these are right. But the - required property of server_port defined in example.QueuingSubsystem is not appeared in inputs - definiton, so will raise excepton of "MissingRequiredInputError". - -imports: - - ../definitions.yaml - -topology_template: - description: Template of a database including its hosting stack. - - inputs: - server_ip: - type: string - description: IP address of the message queuing server to receive messages from. - default: 127.0.0.1 - server_port1: - type: integer - description: Port to be used for receiving messages. - default: 8080 - my_cpus: - type: integer - description: Number of CPUs for the server. - default: 2 - constraints: - - valid_values: [ 1, 2, 4, 8 ] - my_input: - type: integer - description: test for input validation. - default: 123 - - substitution_mappings: - node_type: example.QueuingSubsystem - - node_templates: - tran_app: - type: example.QueuingSubsystem - properties: - server_ip: { get_input: server_ip } - server_port: { get_input: server_port1 } - requirements: - - host: - node: server - - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - disk_size: 10 GB - num_cpus: { get_input: my_cpus } - mem_size: 4096 MB - os: - properties: - architecture: x86_64 - type: Linux - distribution: Ubuntu - version: 14.04 - - outputs: - receiver_ip: - description: private IP address of the message receiver application - value: { get_attribute: [ server, private_address ] } - - groups: - tran_server_group: - members: [ tran_app, server ] - type: tosca.groups.Root diff --git a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/system_invalid_input.yaml b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/system_invalid_input.yaml deleted file mode 100644 index e3cdd71..0000000 --- a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/system_invalid_input.yaml +++ /dev/null @@ -1,24 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -imports: - - queuingsubsystem_invalid_input.yaml - -topology_template: - description: Test template with invalid input. - - inputs: - mq_server_ip: - type: string - default: 127.0.0.1 - description: IP address of the message queuing server to receive messages from. - mq_server_port: - type: integer - default: 8080 - description: Port to be used for receiving messages. - - node_templates: - mq: - type: example.QueuingSubsystem - properties: - server_ip: { get_input: mq_server_ip } - server_port: { get_input: mq_server_port } diff --git a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_example_app_substitution_mappings.yaml b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_example_app_substitution_mappings.yaml deleted file mode 100644 index 718022a..0000000 --- a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_example_app_substitution_mappings.yaml +++ /dev/null @@ -1,70 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -description: > - Template showing an example TOSCA type to demonstrate usage - of output in the substitution mappings. - -node_types: - example.app: - derived_from: tosca.nodes.WebApplication - properties: - mq_server_ip: - type: string - required: False - receiver_port: - type: integer - required: False - attributes: - receiver_ip: - type: string - receiver_port: - type: integer - -topology_template: - inputs: - mq_server_ip: - type: string - description: IP address of the message queuing server to receive messages from. - default: 127.0.0.1 - receiver_port: - type: integer - description: Port to be used for receiving messages. - default: 8080 - my_cpus: - type: integer - description: Number of CPUs for the server. - default: 2 - constraints: - - valid_values: [ 1, 2, 4, 8 ] - - substitution_mappings: - node_type: example.app - - node_templates: - app: - type: example.app - properties: - mq_server_ip: { get_input: mq_server_ip } - receiver_port: { get_input: receiver_port } - requirements: - - host: - node: websrv - websrv: - type: tosca.nodes.WebServer - requirements: - - host: - node: server - server: - type: tosca.nodes.Compute - capabilities: - host: - properties: - disk_size: 10 GB - num_cpus: { get_input: my_cpus } - mem_size: 4096 MB - os: - properties: - architecture: x86_64 - type: Linux - distribution: Ubuntu - version: 14.04 diff --git a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_invalid_output.yaml b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_invalid_output.yaml deleted file mode 100644 index ef21811..0000000 --- a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_invalid_output.yaml +++ /dev/null @@ -1,31 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -imports: - - test_example_app_substitution_mappings.yaml - -topology_template: - description: > - Test template showing valid output section containing attribute defined - in the substitution mappings in the imported yaml file. - - inputs: - mq_server_ip: - type: string - default: 127.0.0.1 - description: IP address of the message queuing server to receive messages from. - mq_server_port: - type: integer - default: 8080 - description: Port to be used for receiving messages. - - node_templates: - substitute_app: - type: example.app - properties: - mq_server_ip: { get_input: mq_server_ip } - receiver_port: { get_input: mq_server_port } - - outputs: - receiver_ip: - description: private IP address of the message receiver application - value: { get_attribute: [ substitute_app, my_cpu_output ] } \ No newline at end of file diff --git a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_valid_output.yaml b/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_valid_output.yaml deleted file mode 100644 index 766ca87..0000000 --- a/jython-tosca-parser/src/main/resources/Lib/site-packages/tosca_parser-0.7.0-py2.7.egg/toscaparser/tests/data/topology_template/validate/test_substitution_mappings_valid_output.yaml +++ /dev/null @@ -1,31 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 - -imports: - - test_example_app_substitution_mappings.yaml - -topology_template: - description: > - Test template showing valid output section containing attribute defined - in the substitution mappings in the imported yaml file. - - inputs: - mq_server_ip: - type: string - default: 127.0.0.1 - description: IP address of the message queuing server to receive messages from. - mq_server_port: - type: integer - default: 8080 - description: Port to be used for receiving messages. - - node_templates: - sustitute_app: - type: example.app - properties: - mq_server_ip: { get_input: mq_server_ip } - receiver_port: { get_input: mq_server_port } - - outputs: - receiver_ip: - description: private IP address of the message receiver application - value: { get_attribute: [ sustitute_app, receiver_ip ] } \ No newline at end of file -- cgit 1.2.3-korg