diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2017-12-24 21:22:51 +0200 |
---|---|---|
committer | talio <tali.orenbach@amdocs.com> | 2017-12-26 09:29:18 +0200 |
commit | aeb418d236199246784bbb5695fc779e48957bd8 (patch) | |
tree | d15096a3000ffa0f113865fc036e86b5335b4c95 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml | |
parent | ce868e6a5ffd8b2e70799b6cd69e1cfce9887a61 (diff) |
fix VM grouping
ignoring fixed_ips value when consolidating VMs
Issue-ID: SDC-774
Change-Id: Icdd88af94ff0609f6efabf69b00ed09836270fff
Signed-off-by: talio <tali.orenbach@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml')
1 files changed, 5 insertions, 25 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 22ad2137d2..e26a807c29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -631,11 +631,6 @@ topology_template: - get_input: oam_net_id vm_flavor_name: get_input: app_flavor_name - port_app_data_0_port_fixed_ips: - - ip_address: - get_input: - - app_data_v6_ips - - 2 vm_image_name: get_input: app_image_name port_app_oam_0_port_name: @@ -666,9 +661,9 @@ topology_template: vf_module_name: get_input: vf_module_name port_app_data_0_port_ip_requirements: - - ip_version: 6 + - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false port_app_internal_0_port_allowed_address_pairs: @@ -834,11 +829,6 @@ topology_template: params: $vnf_name: get_input: vnf_name - port_iox_oam_0_port_fixed_ips: - - ip_address: - get_input: - - iox_oam_ips - - 0 compute_iox_name: - get_input: - iox_names @@ -882,7 +872,7 @@ topology_template: port_iox_oam_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false port_iox_data_0_port_network_role_tag: data @@ -1097,7 +1087,7 @@ topology_template: port_app_oam_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false port_app_internal_0_port_network: @@ -1117,11 +1107,6 @@ topology_template: params: $vnf_name: get_input: vnf_name - port_app_oam_0_port_fixed_ips: - - ip_address: - get_input: - - app_oam_ips - - 0 port_app_data_0_port_replacement_policy: - AUTO compute_app_name: @@ -1203,7 +1188,7 @@ topology_template: port_plt_oam_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: false port_plt_data_0_port_mac_requirements: @@ -1246,11 +1231,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: true - port_plt_oam_0_port_fixed_ips: - - ip_address: - get_input: - - plt_oam_ips - - 0 port_plt_oam_0_port_network_role_tag: oam port_plt_internal_0_port_name: - str_replace: |