diff options
author | 2017-06-11 14:22:02 +0300 | |
---|---|---|
committer | 2017-06-11 17:48:32 +0300 | |
commit | b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 (patch) | |
tree | 0609319203be13f6c29ccbe24cb39c9d64f90095 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation | |
parent | af9929df75604ce407d0ca542b200630164e0ae6 (diff) |
[SDC-29] rebase continue work to align source
Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation')
1 files changed, 9 insertions, 9 deletions
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 |