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 --- .../consolidation/out/MainServiceTemplate.yaml | 18 +++++++++--------- .../noConsolidation/out/MainServiceTemplate.yaml | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml index 5e53a1d849..e5513bd30a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml @@ -280,6 +280,11 @@ topology_template: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - get_input: fsb1-Internal2-mac + compute_FSB_user_data: + - OPTIONAL-DATA-FSB1 + - null + vm_flavor_name: + get_input: fsb-flavor vm_image_name: get_input: fsb-image compute_FSB_admin_pass: @@ -288,6 +293,9 @@ topology_template: port_FSB1_Internal_network: - Internal1-net-fsb1-Internal1 - Internal1-net-fsb1-Internal2 + port_FSB2_Internal_mac_address: + - get_input: fsb2-Internal1-mac + - get_input: fsb2-Internal2-mac port_FSB2_Internal_network: - Internal2-net-fsb2-Internal1 - Internal2-net-fsb2-Internal2 @@ -298,17 +306,9 @@ topology_template: - write_files: - path: /path3/etc/sysconfig/network-scripts/ifcfg-eth0 - path: /path4/etc/sysconfig/network-scripts/ifcfg-eth1 - compute_FSB_user_data: - - OPTIONAL-DATA-FSB1 - - null compute_FSB_availability_zone: - get_input: fsb1_zone - get_input: fsb2_zone - vm_flavor_name: - get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb2-Internal1-mac - - get_input: fsb2-Internal2-mac compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name @@ -357,4 +357,4 @@ topology_template: - FSB2_template - jsa_net - jsa_net1 - - packet_mirror_network_name + - packet_mirror_network_name \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml index 06b43188e5..54d4cfe9ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml @@ -195,16 +195,18 @@ topology_template: properties: port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac - port_FSB1_Internal_network: - - Internal1-net vm_flavor_name: get_input: fsb-flavor - port_FSB2_Internal_mac_address: - - get_input: fsb1-Internal2-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 + port_FSB_OAM_network: + - jsa_net1 + port_FSB1_Internal_network: + - Internal1-net + port_FSB2_Internal_mac_address: + - get_input: fsb1-Internal2-mac port_FSB_OAM_fixed_ips: - - ip_address: get_input: fsb1-oam-ip @@ -216,8 +218,6 @@ topology_template: - path: /path2/etc/sysconfig/network-scripts/ifcfg-eth1 compute_FSB_availability_zone: - get_input: fsb1_zone - port_FSB_OAM_network: - - jsa_net1 compute_FSB_name: - get_input: fsb1-name service_template_filter: @@ -261,4 +261,4 @@ topology_template: - FSB1_Internal1 - FSB1_OAM - FSB1_template - - packet_mirror_network_name + - packet_mirror_network_name \ No newline at end of file -- cgit 1.2.3-korg