From 7a9073719da3db83024e66a1da9ba14546cfd175 Mon Sep 17 00:00:00 2001 From: eleonorali Date: Tue, 10 Apr 2018 15:19:51 +0300 Subject: Defect 451622: Fix for defect 430981 not correct Only one default ipVersion - version4 should be created Change-Id: I27aad6acdacf66cf48f71f0a17cdd414aa510f93 Issue-ID: SDC-1203 Signed-off-by: eleonorali --- .../out/MainServiceTemplate.yaml | 157 +-------------------- 1 file changed, 1 insertion(+), 156 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index da206cc225..e478518c3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -272,11 +272,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: @@ -296,11 +291,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_1b_t1_port_subinterface_indicator: - false port_1b_t1_port_value_specs: @@ -351,11 +341,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_1c201_port_network_role_tag: oam @@ -378,11 +363,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_1c201_port_subinterface_indicator: - false port_1c201_port_mac_requirements: @@ -420,11 +400,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_1c201_port_network_role_tag: oam @@ -447,11 +422,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_1c201_port_subinterface_indicator: - false port_1c201_port_mac_requirements: @@ -491,11 +461,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_1c201_port_network_role_tag: oam @@ -514,11 +479,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_1c201_port_subinterface_indicator: - false port_1c201_port_mac_requirements: @@ -560,11 +520,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_1c201_port_network_role_tag: oam @@ -583,11 +538,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_1c201_port_subinterface_indicator: - false port_1c201_port_mac_requirements: @@ -752,11 +702,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -775,11 +720,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -1040,21 +980,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_1c1_t1_port_name: @@ -1160,11 +1090,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_2b_scheduler_hints: @@ -1182,11 +1107,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_b_single_2b_name: - get_input: - b_single_2b_names @@ -1261,21 +1181,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_1c1_t1_port_name: @@ -1446,11 +1356,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_a_single_2a_scheduler_hints: - group: BE_Affinity_group compute_a_single_2a_availability_zone: @@ -1556,11 +1461,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false fixed_ips: - ip_address: get_input: @@ -1582,11 +1482,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false fixed_ips: - ip_address: get_input: @@ -1617,11 +1512,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name compute_b_single_2b_scheduler_hints: @@ -1639,11 +1529,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false compute_b_single_2b_name: - get_input: - b_single_2b_names @@ -1778,11 +1663,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false server_group: BE_Affinity_group connectivityChk: connectivityTo1C1_T1_02: @@ -1865,11 +1745,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_pcm_port_00_network_role_tag: cps pcm_flavor_name: get_input: pcm_flavor_name @@ -1898,11 +1773,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false fixed_ips: - ip_address: get_input: @@ -1926,11 +1796,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false server_group: BE_Affinity_group connectivityChk: connectivityTo4PNested_2: @@ -2013,11 +1878,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_pcm_port_00_network_role_tag: cps pcm_flavor_name: get_input: pcm_flavor_name @@ -2046,11 +1906,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false fixed_ips: - ip_address: get_input: @@ -2081,11 +1936,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false vm_image_name: get_input: pd_image_name port_1b_t2_port_subinterface_indicator: @@ -2105,11 +1955,6 @@ topology_template: is_required: false floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false port_1b_t1_port_subinterface_indicator: - false compute_b_single_1b_metadata: @@ -2329,4 +2174,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group + - BE_Affinity_group \ No newline at end of file -- cgit 1.2.3-korg