diff options
author | 2018-04-10 15:19:51 +0300 | |
---|---|---|
committer | 2018-04-10 14:32:37 +0000 | |
commit | 7a9073719da3db83024e66a1da9ba14546cfd175 (patch) | |
tree | 3d2b8e442fe7837c4ab041ac147ffe7a192bbbb0 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out | |
parent | 14f12f45bb7a41513d82b73f4c72b14c2e5584e3 (diff) |
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 <eleonoral@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out')
1 files changed, 3 insertions, 188 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index 7d3f8d8bf2..6c1b8e5c95 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -1989,11 +1989,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 security_groups: - cscf_RSG fixed_ips: @@ -2056,11 +2051,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 security_groups: - cscf_RSG fixed_ips: @@ -2123,11 +2113,6 @@ topology_template: port_cdi_internal_1_port_network: - cscf_internal_network_0 port_cdi_ims_core_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: true - ip_version: 6 ip_count_required: is_required: true @@ -2208,11 +2193,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 security_groups: - cscf_RSG fixed_ips: @@ -2331,11 +2311,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 security_groups: - cscf_RSG fixed_ips: @@ -2375,11 +2350,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 vcscf_gateway: get_input: oam_internal_vip_0 vnf_name: @@ -2425,11 +2395,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 vcscf_name_delimeter: get_input: vcscf_name_delimeter tdcore_internal_ips: @@ -2472,11 +2437,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 security_groups: - cscf_RSG fixed_ips: @@ -2505,11 +2465,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 security_groups: - cscf_RSG fixed_ips: @@ -2608,11 +2563,6 @@ topology_template: compute_lbd_config_drive: - true port_lbd_ims_core_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: true - ip_version: 6 ip_count_required: is_required: true @@ -2629,11 +2579,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_lbd_internal_1_port_security_groups: - - cscf_RSG port_lbd_ims_core_1_port_security_groups: @@ -2657,11 +2602,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 compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -2708,11 +2648,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 security_groups: - cscf_RSG fixed_ips: @@ -2759,11 +2694,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 vcscf_gateway: get_input: oam_internal_vip_0 vnf_name: @@ -2809,11 +2739,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 vcscf_name_delimeter: get_input: vcscf_name_delimeter tdcore_internal_ips: @@ -2899,11 +2824,6 @@ topology_template: compute_cdi_name: - get_input: cdi_name_0 port_cdi_ims_core_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: true - ip_version: 6 ip_count_required: is_required: true @@ -3025,11 +2945,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false port_oam_oam_1_port_subinterface_indicator: - false @@ -3051,11 +2966,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_oam_oam_1_port_network: - get_input: oam_net_id port_oam_internal_1_port_allowed_address_pairs: @@ -3189,11 +3099,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false compute_oam_scheduler_hints: - group: oam_server_group_group @@ -3203,11 +3108,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 compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_metadata: @@ -3251,11 +3151,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 security_groups: - cscf_RSG fixed_ips: @@ -3346,11 +3241,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_oam_internal_0_port_network: - cscf_internal_network_0 vm_image_name: @@ -3385,11 +3275,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false port_oam_internal_0_port_mac_requirements: mac_count_required: @@ -3458,11 +3343,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_lbd_ims_core_0_port_network: - get_input: ims_core_net_id port_lbd_ims_core_0_port_mac_requirements: @@ -3488,11 +3368,6 @@ topology_template: mac_count_required: is_required: false port_lbd_ims_core_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: true - ip_version: 6 ip_count_required: is_required: true @@ -3560,11 +3435,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 service_template_filter: substitute_service_template: Nested_lbd_1ServiceTemplate.yaml count: 1 @@ -3682,11 +3552,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 security_groups: - cscf_RSG fixed_ips: @@ -3722,11 +3587,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 security_groups: - cscf_RSG fixed_ips: @@ -3755,11 +3615,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 security_groups: - cscf_RSG fixed_ips: @@ -3821,11 +3676,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false port_cif_ims_li_0_port_fixed_ips: - ip_address: @@ -3835,11 +3685,6 @@ topology_template: port_cif_oam_0_port_1_security_groups: - - cscf_RSG port_cif_ims_li_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: true - ip_version: 6 ip_count_required: is_required: true @@ -3886,11 +3731,6 @@ topology_template: port_cif_oam_0_port_3_security_groups: - - cscf_RSG port_cif_ims_core_0_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: true - ip_version: 6 ip_count_required: is_required: true @@ -3967,18 +3807,13 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false port_cif_internal_0_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: - is_required: true + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -4043,11 +3878,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false port_cif_internal_1_port_security_groups: - - cscf_RSG @@ -4091,11 +3921,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false port_cif_ims_core_1_port_mac_requirements: mac_count_required: @@ -4109,7 +3934,7 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -4141,11 +3966,6 @@ topology_template: mac_count_required: is_required: false port_cif_ims_li_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: true - ip_version: 6 ip_count_required: is_required: true @@ -4162,11 +3982,6 @@ topology_template: mac_count_required: is_required: false port_cif_ims_core_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: true - ip_version: 6 ip_count_required: is_required: true @@ -4394,4 +4209,4 @@ topology_template: get_input: vnf_name container_type: host targets: - - tdcore_zone_1_server_group_group + - tdcore_zone_1_server_group_group
\ No newline at end of file |