From 1c377c679ba8c8771288788fdffb956cfd9f6f08 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Sun, 31 Jul 2016 14:39:16 +0800 Subject: Use the real yaml file in testcase of system.yaml As a tester; I want to make sure of the validation of substitution mappings in system chain. So i use the real test yaml file and delete the old. Change-Id: Id3dee02d8af5b221b654a3ee79e28f0ad5b53868 JIRA:PARSER-74 Signed-off-by: shangxdy --- .../tests/data/topology_template/system.yaml | 37 ++++++++++------------ 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml') diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml index 84d625d..3c946f3 100644 --- a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml +++ b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml @@ -1,8 +1,9 @@ tosca_definitions_version: tosca_simple_yaml_1_0 imports: - - definitions.yaml - - subsystem.yaml + - queuingsubsystem.yaml + - transactionsubsystem.yaml + - databasesubsystem.yaml topology_template: description: Template of online transaction processing service. @@ -21,13 +22,13 @@ topology_template: mq: type: example.QueuingSubsystem # properties: - # to be updated when substitution_mapping is implemented + # to be updated when substitution_mapping is validated later properties: server_ip: { get_input: mq_server_ip } server_port: { get_input: mq_server_port } # capabilities: # message_queue_endpoint: - # to be updated when substitution_mapping is implemented + # to be updated when substitution_mapping is validated later requirements: - receiver1: trans1 - receiver2: trans2 @@ -35,37 +36,33 @@ topology_template: trans1: type: example.TransactionSubsystem properties: - # TODO to be updated when substitution_mapping is implemented - # mq_server_ip: { get_attribute: [ mq, server_ip ] } - # for now, we will use the loopback address to avoid errors as - # this property is required in the schema - mq_server_ip: 127.0.0.1 - receiver_port: 8080 + # mq_server_ip: 127.0.0.1 + mq_server_ip: { get_attribute: [ mq, server_ip ] } + # receiver_port: 8080 + receiver_port: { get_attribute: [ mq, server_port ] } # capabilities: # message_receiver: - # to be updated when substitution_mapping is implemented + # to be updated when substitution_mapping is validated later requirements: - database_endpoint: dbsys trans2: type: example.TransactionSubsystem properties: - # TODO to be updated when substitution_mapping is implemented - # mq_server_ip: { get_attribute: [ mq, server_ip ] } - # for now, we will use the loopback address to avoid errors as - # this property is required in the schema - mq_server_ip: 127.0.0.1 - receiver_port: 8080 + # mq_server_ip: 127.0.0.1 + mq_server_ip: { get_attribute: [ mq, server_ip ] } + # receiver_port: 8080 + receiver_port: { get_attribute: [ mq, server_port ] } # capabilities: # message_receiver: - # to be updated when substitution_mapping is implemented + # to be updated when substitution_mapping is validated later requirements: - database_endpoint: dbsys dbsys: type: example.DatabaseSubsystem # properties: - # to be updated when substitution_mapping is implemented + # to be updated when substitution_mapping is validated later # capabilities: # database_endpoint: - # to be updated when substitution_mapping is implemented + # to be updated when substitution_mapping is validated later -- cgit 1.2.3-korg