From b8e2faf476202b6ffe61bc3a9a37df1304881d40 Mon Sep 17 00:00:00 2001 From: Avi Ziv Date: Tue, 18 Jul 2017 19:45:38 +0300 Subject: [SDC] Onboarding 1710 rebase. Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535 Signed-off-by: Avi Ziv --- .../out/MainServiceTemplate.yaml | 80 +++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index f50bc8b417..f379c67f1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -170,8 +170,8 @@ topology_template: description: name of the oam network default: oam_protected_net_0 node_templates: - abstract_pd_server_2: - type: org.openecomp.resource.abstract.nodes.pd_server_2 + abstract_pd_server: + type: org.openecomp.resource.abstract.nodes.pd_server directives: - substitutable properties: @@ -180,54 +180,37 @@ topology_template: compute_pd_server_name: - get_input: - pd_server_names - - 2 + - 1 vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_2_network_role_tag: oam - port_pd01_port_3_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_3_mac_requirements: + port_pd01_port_mac_requirements: mac_count_required: is_required: false - port_pd01_port_3_network: - - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_2_network: - - get_input: oam_net_name - port_pd01_port_2_mac_requirements: - mac_count_required: - is_required: false - port_pd01_port_3_network_role_tag: oam - compute_pd_server_user_data_format: - - RAW - port_pd01_port_2_ip_requirements: + port_pd01_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false + port_pd01_port_network: + - get_input: oam_net_name + port_pd01_port_network_role_tag: oam + compute_pd_server_user_data_format: + - RAW service_template_filter: - substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml + substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 index_value: get_property: - SELF - service_template_filter - index_value - network_policy_server: - type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules - properties: - name: - get_input: dummy_net_name_1 - abstract_pd_server_0: - type: org.openecomp.resource.abstract.nodes.pd_server_0 + abstract_pd_server_2: + type: org.openecomp.resource.abstract.nodes.pd_server_2 directives: - substitutable properties: @@ -236,35 +219,52 @@ topology_template: compute_pd_server_name: - get_input: - pd_server_names - - 1 + - 2 vm_flavor_name: get_attribute: - network_policy_server - name - port_pd01_port_mac_requirements: + port_pd01_port_2_network_role_tag: oam + port_pd01_port_3_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_3_mac_requirements: mac_count_required: is_required: false + port_pd01_port_3_network: + - get_input: oam_net_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd01_port_2_network: + - get_input: oam_net_name + port_pd01_port_2_mac_requirements: + mac_count_required: + is_required: false + port_pd01_port_3_network_role_tag: oam + compute_pd_server_user_data_format: + - RAW + port_pd01_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - port_pd01_port_network_role_tag: oam - compute_pd_server_user_data_format: - - RAW service_template_filter: - substitute_service_template: Nested_pd_server_0ServiceTemplate.yaml + substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 index_value: get_property: - SELF - service_template_filter - index_value + network_policy_server: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules + properties: + name: + get_input: dummy_net_name_1 abstract_pd_server_1: type: org.openecomp.resource.abstract.nodes.pd_server_1 directives: @@ -313,6 +313,6 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server_0 + - abstract_pd_server - abstract_pd_server_1 - abstract_pd_server_2 -- cgit 1.2.3-korg