diff options
author | eleonorali <eleonoral@amdocs.com> | 2018-04-10 15:19:51 +0300 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 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/heat/parameters | |
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/heat/parameters')
5 files changed, 1 insertions, 66 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml index 1bfe72d554..ac73bf2b00 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml @@ -929,11 +929,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 mac_requirements: mac_count_required: is_required: false @@ -954,11 +949,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 mac_requirements: mac_count_required: is_required: false @@ -979,11 +969,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 mac_requirements: mac_count_required: is_required: false @@ -1018,11 +1003,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 mac_requirements: mac_count_required: is_required: false @@ -1071,11 +1051,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 mac_requirements: mac_count_required: is_required: false @@ -1096,11 +1071,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 mac_requirements: mac_count_required: is_required: false @@ -1139,4 +1109,4 @@ topology_template: members: - pd03_port_0 - server_pd_02 - - pd04_port_0 + - pd04_port_0
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml index c28ffa1a53..632cd40e0c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml @@ -261,11 +261,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 mac_requirements: mac_count_required: is_required: false @@ -311,11 +306,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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index fdb9c308e0..1582a7e4b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -107,11 +107,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: - get_input: security_group_name fixed_ips: @@ -150,11 +145,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: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml index c1a99f3c45..8bdff8f08b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml @@ -99,11 +99,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: - get_input: security_group_name fixed_ips: @@ -129,11 +124,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: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml index c84dac25ad..ae852574f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml @@ -152,11 +152,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: - get_input: security_group_name fixed_ips: |