From b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 11 Jun 2017 14:22:02 +0300 Subject: [SDC-29] rebase continue work to align source Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando --- .../out/MainServiceTemplate.yaml | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index 871efb849a..2174bb769f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -73,6 +73,21 @@ topology_template: directives: - substitutable properties: + compute_pd_server_availability_zone: + - get_input: availabilityzone_name + - get_input: availabilityzone_name + compute_pd_server_name: + - get_input: + - pd_server_names + - 1 + - get_input: + - pd_server_names + - 0 + port_pd01_port_replacement_policy: + - AUTO + - AUTO + vm_flavor_name: + get_input: pd_flavor_name port_pd01_port_mac_requirements: - mac_count_required: is_required: false @@ -94,21 +109,6 @@ topology_template: port_pd01_port_network: - Network-PD-1 - Network-PD-0 - compute_pd_server_availability_zone: - - get_input: availabilityzone_name - - get_input: availabilityzone_name - compute_pd_server_name: - - get_input: - - pd_server_names - - 1 - - get_input: - - pd_server_names - - 0 - port_pd01_port_replacement_policy: - - AUTO - - AUTO - vm_flavor_name: - get_input: pd_flavor_name compute_pd_server_user_data_format: - null - get_attribute: @@ -134,8 +134,6 @@ topology_template: - get_input: - ps_server_names - 1 - vm_image_name: - get_input: ps_image_name compute_ps_server_availability_zone: - get_input: availabilityzone_name - get_input: availabilityzone_name @@ -144,6 +142,10 @@ topology_template: - abstract_pd_server - pd_server_accessIPv4 - null + vm_flavor_name: + get_input: ps_flavor_name + vm_image_name: + get_input: ps_image_name port_ps01_port_replacement_policy: - AUTO - AUTO @@ -155,8 +157,6 @@ topology_template: port_ps01_port_network: - Network-PS-0 - Network-PS-1 - vm_flavor_name: - get_input: ps_flavor_name port_ps01_port_ip_requirements: - - ip_version: 4 ip_count_required: -- cgit 1.2.3-korg